rack-redic 1.4.2 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 858c6435585b418d0bf83041a2bc47a149af5f01e762e93626abf1f796cf1dde
-  data.tar.gz: 45342e5a439c2ef133cf3cca12a6466c4eb4a59043bfbf43d193db624bb9cbbf
+  metadata.gz: 3ab018c4006841a49c2b74041226bb3ecc65421eaf982d5888ad243bae99ba2a
+  data.tar.gz: d5f1f5674fc74790ed25010f0e0e04f4a612f87553adb3820d547702da4278ef
 SHA512:
-  metadata.gz: 3714511e22ab32a161a19109aa764240902ee7b6f65fe5b3e4625477a28ef02e07ec63ea40599d88552a1af47319a0913f153ade190eba974e2111e745174c0f
-  data.tar.gz: 49e4025623ce5734539767f44e9ba147693a07211f2200e2dc10b97f7f4ad735d42826fe3275f2c1a515abcd592f9469c5d92d326a9f16943bda68564e625236
+  metadata.gz: 9ebe8381cab1210746b77c9a881aa84c4410756317a0cdbc5b1233387f97ed145fd4b22ec47e750b5a0884bd4418d4f1389a3f8d24f63dbf9cd219fe7f79b8b9
+  data.tar.gz: 9e936e59d7e1ab45e22b8dba35124d098bdd03ef0ece23aeef82c9db60e26d5b24e98ccbcfe7715ac47f5480ebc3465085fd612bd6bf76c3a0be0ffaae528369

data/README.org

@@ -0,0 +1,105 @@
+* Rack::Session::Redic
+
+=Rack::Session::Redic= provides simple cookie based session management.  Session
+data is stored in [[http://redis.io][Redis]] via the [[https://github.com/amakawa/redic][Redic]] gem. The corresponding session key is
+maintained in the cookie.
+
+Options include:
+
+- =:marshaller= - You may optionally supply the class/module you would
+  like to use when marshalling objects in and out of Redis. All that is
+  required is that this class respond to the =load= and =dump= methods,
+  returning the session hash and a string respectively.
+- =:url= - Additionally, you may pass in the URL for your Redis server.
+  The default URL is fetched from the =ENV= as =REDIS_URL= in keeping
+  with Heroku and others' practices.
+- =:expire_after= - Finally, expiration will be passed to the Redis
+  server via the 'EX' option on 'SET'. Expiration should be in seconds,
+  just like Rack's default handling of the =:expire_after= option. This
+  option will refresh the expiration set in Redis with each request.
+
+Any other options will get passed to =Rack::Session::Abstract::Persisted=.
+
+** Installation
+
+Add this line to your application's Gemfile or gems.rb file:
+
+#+begin_src ruby
+gem 'rack-redic', require: 'rack/session/redic'
+#+end_src
+
+And then execute:
+
+#+begin_src sh
+bundle
+#+end_src
+
+Or install it yourself as:
+
+#+begin_src sh
+gem install rack-redic
+#+end_src
+
+** Usage
+
+Anywhere in your Rack application just add:
+
+#+begin_src ruby
+# Most basic usage.
+use Rack::Session::Redic
+
+# Optionally pass in a marshaller.
+use Rack::Session::Redic, marshaller: Oj
+
+# And/or pass in the URL of your Redis server.
+use Rack::Session::Redic, marshaller: Oj, url: 'redis://host:port'
+
+# And/or pass in the expiration. (1_800 is 30 minutes in seconds)
+use Rack::Session::Redic, marshaller: Oj, url: 'redis://host:port', expire_after: 1_800
+#+end_src
+
+** Custom Marshallers
+
+Since the class/module passed as =:marshaller= only needs to respond to the
+methods =load= and =dump=, you can create any kind of marshaller you would like.
+I've included examples for MessagePack and Oj here as reference.
+
+*** [[https://github.com/msgpack/msgpack-ruby][MessagePack]]
+
+#+begin_src ruby
+require 'msgpack'
+
+MessagePack::DefaultFactory.register_type(0x00, Symbol)
+
+module MessagePackMarshaller
+  def self.dump(object)
+    MessagePack.pack(object)
+  end
+
+  def self.load(string)
+    MessagePack.unpack(string)
+  end
+end
+#+end_src
+
+Then, while adding it your Rack application.
+
+#+BEGIN_SRC ruby
+use Rack::Session::Redic, marshaller: MessagePackMarshaller
+#+END_SRC
+
+*NOTE:* MessagePack [[https://github.com/msgpack/msgpack-ruby#serializing-and-deserializing-symbols][serializes symbols as strings by default]] so I suggest
+customizing that behavior per their instructions. You can [[https://github.com/msgpack/msgpack/blob/master/spec.md#types-extension-type][read more about
+MessagePack's extension formats here]].
+
+*** [[https://github.com/ohler55/oj][Oj]]
+
+Oj responds to =load= and =dump= by default so there's no adapter module needed.
+
+#+begin_src ruby
+use Rack::Session::Redic, marshaller: Oj
+#+end_src
+
+** License
+
+The gem is available as open source under the terms of the [[http://opensource.org/licenses/MIT][MIT License]].

data/lib/rack/session/redic.rb

@@ -25,6 +25,8 @@ module Rack
     #
     # Any other options will get passed to Rack::Session::Abstract::Persisted.
     class Redic < Abstract::Persisted
+      HASH = {}.freeze
+
       # Redis commands.
       DELETE = 'DEL'
       EX = 'EX'
@@ -41,13 +43,12 @@ module Rack
       # @return [Redic]
       attr_reader :storage
 
-      def initialize(app, options = {})
-        super
+      def initialize(app, options = HASH)
+        super(app, options)
 
         @expires = options[:expire_after]
-        @marshaller = options.fetch(:marshaller) { Marshal }
-        @mutex = Mutex.new
-        @storage = ::Redic.new(options.fetch(:url) { ENV.fetch(REDIS_URL) })
+        @marshaller = options.fetch(:marshaller, Marshal)
+        @storage = ::Redic.new(options.fetch(:url, ENV.fetch(REDIS_URL)))
       end
 
       # Generate a session ID that doesn't already exist.
@@ -66,33 +67,28 @@ module Rack
 
       # Find the session (or generate a blank one).
       def find_session(_req, session_id)
-        @mutex.synchronize do
-          unless session_id && (session = deserialize(@storage.call(GET, session_id)))
-            session_id, session = generate_sid, {} # rubocop:disable Style/ParallelAssignment
-          end
-
-          [session_id, session]
+        unless session_id && (session = deserialize(@storage.call(GET, session_id)))
+          session_id, session = generate_sid, {} # rubocop:disable Style/ParallelAssignment
         end
+
+        [session_id, session]
       end
 
       # Write the session.
-      def write_session(_req, session_id, new_session, _options)
-        arguments = [SET, session_id, serialize(new_session)]
+      def write_session(_req, session_id, session_data, _options)
+        arguments = [SET, session_id, serialize(session_data)]
         arguments.push(EX, @expires) if @expires
 
-        @mutex.synchronize do
-          @storage.call(*arguments)
+        @storage.call(*arguments)
 
-          session_id
-        end
+        session_id
       end
 
       # Kill the session.
       def delete_session(_req, session_id, options)
-        @mutex.synchronize do
-          @storage.call(DELETE, session_id)
-          generate_sid unless options[:drop]
-        end
+        @storage.call(DELETE, session_id)
+
+        generate_sid unless options[:drop]
       end
 
       private
@@ -115,7 +111,7 @@ module Rack
         @marshaller.load(string) if string
 
       # In the case that loading fails, return a nil.
-      rescue # rubocop:disable Lint/RescueStandardError
+      rescue # rubocop:disable Style/RescueStandardError
         nil
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rack-redic
 version: !ruby/object:Gem::Version
-  version: 1.4.2
+  version: 2.0.0
 platform: ruby
 authors:
 - Evan Lecklider
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-12 00:00:00.000000000 Z
+date: 2021-06-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -38,6 +38,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: bundler
+  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'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -52,6 +66,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  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'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
@@ -66,6 +94,62 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop-minitest
+  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'
+- !ruby/object:Gem::Dependency
+  name: rubocop-packaging
+  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'
+- !ruby/object:Gem::Dependency
+  name: rubocop-performance
+  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'
+- !ruby/object:Gem::Dependency
+  name: rubocop-rake
+  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: Rack::Session in Redis via Redic
 email:
 - evan@lecklider.com
@@ -73,24 +157,15 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".editorconfig"
-- ".gitignore"
-- ".rubocop.yml"
-- CODE_OF_CONDUCT.md
 - LICENSE.txt
-- Makefile
-- README.md
-- Rakefile
-- gems.rb
+- README.org
 - lib/rack/session/redic.rb
-- rack-redic.gemspec
-- test/all.rb
-- test/helper.rb
-- test/session_redic_test.rb
 homepage: https://github.com/evanleck/rack-redic
 licenses:
 - MIT
-metadata: {}
+metadata:
+  bug_tracker_uri: https://github.com/evanleck/rack-redic/issues
+  source_code_uri: https://github.com/evanleck/rack-redic
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -99,19 +174,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 3.2.15
 signing_key: 
 specification_version: 4
 summary: Rack::Session in Redis via Redic
-test_files:
-- test/all.rb
-- test/helper.rb
-- test/session_redic_test.rb
+test_files: []

data/.editorconfig

@@ -1,24 +0,0 @@
-# http://EditorConfig.org
-# This is the top most config file.
-root = true
-
-# All files
-[*]
-
-# Unix-style newlines with a newline ending every file
-end_of_line = lf
-insert_final_newline = true
-
-# Character set
-charset = utf-8
-
-# Trim extra whitespace.
-trim_trailing_whitespace = true
-
-# Soft tabs and 2 spaces.
-indent_style = space
-indent_size = 2
-
-# Makefiles use tabs
-[Makefile]
-indent_style = tab

data/.gitignore

@@ -1,10 +0,0 @@
-/.bundle/
-/.yardoc
-/Gemfile.lock
-/gems.locked
-/_yardoc/
-/coverage/
-/doc/
-/pkg/
-/spec/reports/
-/tmp/

data/.rubocop.yml

@@ -1,55 +0,0 @@
-# http://rubocop.readthedocs.io
-# https://github.com/bbatsov/rubocop/blob/master/config/enabled.yml
-AllCops:
-  DisplayCopNames: true
-  DisplayStyleGuide: true
-  ExtraDetails: true
-  TargetRubyVersion: 2.4
-
-Layout/AlignParameters:
-  EnforcedStyle: with_fixed_indentation
-
-Layout/EmptyLineAfterMagicComment:
-  Enabled: false
-
-Layout/IndentHash:
-  EnforcedStyle: consistent
-
-Layout/MultilineOperationIndentation:
-  EnforcedStyle: indented
-
-Layout/SpaceInsideStringInterpolation:
-  EnforcedStyle: space
-
-Metrics/AbcSize:
-  Enabled: false
-
-Metrics/BlockLength:
-  Enabled: false
-
-Metrics/ClassLength:
-  Enabled: false
-
-Metrics/CyclomaticComplexity:
-  Enabled: false
-
-Metrics/LineLength:
-  Enabled: false
-
-Metrics/MethodLength:
-  Enabled: false
-
-Metrics/ModuleLength:
-  Enabled: false
-
-Metrics/PerceivedComplexity:
-  Enabled: false
-
-# Style/Documentation:
-#   Enabled: false
-
-Style/IfUnlessModifier:
-  Enabled: false
-
-Style/Next:
-  MinBodyLength: 8

data/CODE_OF_CONDUCT.md

@@ -1,49 +0,0 @@
-# Contributor Code of Conduct
-
-As contributors and maintainers of this project, and in the interest of
-fostering an open and welcoming community, we pledge to respect all people who
-contribute through reporting issues, posting feature requests, updating
-documentation, submitting pull requests or patches, and other activities.
-
-We are committed to making participation in this project a harassment-free
-experience for everyone, regardless of level of experience, gender, gender
-identity and expression, sexual orientation, disability, personal appearance,
-body size, race, ethnicity, age, religion, or nationality.
-
-Examples of unacceptable behavior by participants include:
-
-* The use of sexualized language or imagery
-* Personal attacks
-* Trolling or insulting/derogatory comments
-* Public or private harassment
-* Publishing other's private information, such as physical or electronic
-  addresses, without explicit permission
-* Other unethical or unprofessional conduct
-
-Project maintainers have the right and responsibility to remove, edit, or
-reject comments, commits, code, wiki edits, issues, and other contributions
-that are not aligned to this Code of Conduct, or to ban temporarily or
-permanently any contributor for other behaviors that they deem inappropriate,
-threatening, offensive, or harmful.
-
-By adopting this Code of Conduct, project maintainers commit themselves to
-fairly and consistently applying these principles to every aspect of managing
-this project. Project maintainers who do not follow or enforce the Code of
-Conduct may be permanently removed from the project team.
-
-This code of conduct applies both within project spaces and in public spaces
-when an individual is representing the project or its community.
-
-Instances of abusive, harassing, or otherwise unacceptable behavior may be
-reported by contacting a project maintainer at evan@lecklider.com. All
-complaints will be reviewed and investigated and will result in a response that
-is deemed necessary and appropriate to the circumstances. Maintainers are
-obligated to maintain confidentiality with regard to the reporter of an
-incident.
-
-This Code of Conduct is adapted from the [Contributor Covenant][homepage],
-version 1.3.0, available at
-[http://contributor-covenant.org/version/1/3/0/][version]
-
-[homepage]: http://contributor-covenant.org
-[version]: http://contributor-covenant.org/version/1/3/0/

data/Makefile

@@ -1,18 +0,0 @@
-.DEFAULT_GOAL := test
-.PHONY: test
-.SILENT: test
-
-BE := bundle exec
-
-# Run our test suite.
-#
-# To test an individual file, pass the "file" argument like so:
-#
-#   make test file=test/storage_test.rb
-#
-test:
-ifeq ($(origin file), undefined)
-	$(BE) ruby -r ./test/helper.rb test/all.rb
-else
-	$(BE) ruby -r ./test/helper.rb $(file)
-endif

data/README.md

@@ -1,97 +0,0 @@
-# Rack::Session::Redic
-
-`Rack::Session::Redic` provides simple cookie based session management. Session data is stored in [Redis](http://redis.io) via the [Redic](https://github.com/amakawa/redic) gem. The corresponding session key is maintained in the cookie.
-
-Options include:
-
-- `:marshaller` - You may optionally supply the class/module you would like to use when marshalling objects in and out of Redis. All that is required is that this class respond to the  `load` and `dump` methods, returning the session hash and a string respectively.
-- `:url` - Addtionally, you may pass in the URL for your Redis server. The default URL is fetched from the `ENV` as `REDIS_URL` in keeping with Heroku and others' practices.
-- `:expire_after` - Finally, expiration will be passed to the Redis server via the 'EX' option on 'SET'. Expiration should be in seconds, just like Rack's default handling of the `:expire_after` option. This option will refresh the expiration set in Redis with each request.
-
-Any other options will get passed to `Rack::Session::Abstract::Persisted`.
-
-
-## Installation
-
-Add this line to your application's Gemfile or gems.rb file:
-
-```ruby
-gem 'rack-redic', require: 'rack/session/redic'
-```
-
-And then execute:
-
-    $ bundle
-
-Or install it yourself as:
-
-    $ gem install rack-redic
-
-
-## Usage
-
-Anywhere in your Rack application just add:
-
-```ruby
-# Most basic usage.
-use Rack::Session::Redic
-
-# Optionally pass in a marshaller.
-use Rack::Session::Redic, marshaller: Oj
-
-# And/or pass in the URL of your Redis server.
-use Rack::Session::Redic, marshaller: Oj, url: 'redis://host:port'
-
-# And/or pass in the expiration. (1_800 is 30 minutes in seconds)
-use Rack::Session::Redic, marshaller: Oj, url: 'redis://host:port', expire_after: 1_800
-```
-
-### Custom Marshallers
-
-Since the class/module passed as `:marshaller` only needs to respond to the methods `load` and `dump`, you can create any kind of marshaller you would like. I've included examples for MessagePack and Oj here as reference.
-
-#### [MessagePack](https://github.com/msgpack/msgpack-ruby)
-
-```ruby
-require 'msgpack'
-
-MessagePack::DefaultFactory.register_type(0x00, Symbol)
-
-module MessagePackMarshaller
-  def dump(object)
-    MessagePack.pack(object)
-  end
-  module_function :dump
-
-  def load(string)
-    MessagePack.unpack(string)
-  end
-  module_function :load
-end
-```
-
-Then, while adding it your Rack application.
-
-```ruby
-use Rack::Session::Redic, marshaller: MessagePackMarshaller
-```
-
-**NOTE:** MessagePack [serializes symbols as strings by default](https://github.com/msgpack/msgpack-ruby#serializing-and-deserializing-symbols) so I suggest customizing that behavior per their instructions. You can [read more about MessagePack's extension formats here](https://github.com/msgpack/msgpack/blob/master/spec.md#types-extension-type).
-
-#### [Oj](https://github.com/ohler55/oj)
-
-Oj responds to `load` and `dump` by default so there's no adapter module needed.
-
-```ruby
-use Rack::Session::Redic, marshaller: Oj
-```
-
-
-## Contributing
-
-Bug reports and pull requests are welcome on GitHub at [https://github.com/evanleck/rack-redic](https://github.com/evanleck/rack-redic). This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.
-
-
-## License
-
-The gem is available as open source under the terms of the [MIT License](http://opensource.org/licenses/MIT).

data/Rakefile

@@ -1,2 +0,0 @@
-# frozen_string_literal: true
-require 'bundler/gem_tasks'

data/gems.rb

@@ -1,5 +0,0 @@
-# frozen_string_literal: true
-source 'https://rubygems.org'
-
-# Load gem dependencies.
-gemspec

data/rack-redic.gemspec

@@ -1,20 +0,0 @@
-# frozen_string_literal: true
-Gem::Specification.new do |spec|
-  spec.name    = 'rack-redic'
-  spec.version = '1.4.2'
-  spec.authors = ['Evan Lecklider']
-  spec.email   = ['evan@lecklider.com']
-
-  spec.summary     = 'Rack::Session in Redis via Redic'
-  spec.description = 'Rack::Session in Redis via Redic'
-  spec.homepage    = 'https://github.com/evanleck/rack-redic'
-  spec.license     = 'MIT'
-  spec.files       = `git ls-files`.split("\n")
-  spec.test_files  = spec.files.grep(/^test/)
-
-  spec.add_dependency 'rack'
-  spec.add_dependency 'redic'
-
-  spec.add_development_dependency 'minitest'
-  spec.add_development_dependency 'rubocop'
-end

data/test/all.rb

@@ -1,5 +0,0 @@
-# frozen_string_literal: true
-require_relative 'helper'
-
-# Require all test files.
-Dir.glob('test/*.rb').each(&method(:require))

data/test/helper.rb

@@ -1,13 +0,0 @@
-# frozen_string_literal: true
-
-# Add our project folder to the root of our load path.
-$LOAD_PATH.unshift File.expand_path('..', __dir__)
-
-# Ensure we have this set before trying to initialize anything.
-ENV['REDIS_URL'] ||= 'redis://localhost:6379'
-
-# Require our core library.
-require 'lib/rack/session/redic'
-
-# Kick off the tests.
-require 'minitest/autorun'

data/test/session_redic_test.rb

@@ -1,233 +0,0 @@
-# frozen_string_literal: true
-require 'rack/lint'
-require 'rack/mock'
-
-# These tests are unceremoniously copied and modified from
-# https://github.com/rack/rack/blob/master/test/spec_session_memcache.rb.
-describe Rack::Session::Redic do
-  ROOT = '/'
-
-  session_key = Rack::Session::Abstract::Persisted::DEFAULT_OPTIONS[:key]
-  session_match = /#{ session_key }=([0-9a-fA-F]+);/
-
-  incrementor = lambda do |env|
-    env['rack.session']['counter'] ||= 0
-    env['rack.session']['counter'] += 1
-
-    Rack::Response.new(env['rack.session'].inspect).to_a
-  end
-
-  drop_session = Rack::Lint.new(proc do |env|
-    env['rack.session.options'][:drop] = true
-    incrementor.call(env)
-  end)
-
-  renew_session = Rack::Lint.new(proc do |env|
-    env['rack.session.options'][:renew] = true
-    incrementor.call(env)
-  end)
-
-  defer_session = Rack::Lint.new(proc do |env|
-    env['rack.session.options'][:defer] = true
-    incrementor.call(env)
-  end)
-
-  skip_session = Rack::Lint.new(proc do |env|
-    env['rack.session.options'][:skip] = true
-    incrementor.call(env)
-  end)
-
-  incrementor = Rack::Lint.new(incrementor)
-
-  it 'creates a new cookie' do
-    redic = Rack::Session::Redic.new(incrementor)
-    response = Rack::MockRequest.new(redic).get(ROOT)
-
-    assert_includes response[Rack::SET_COOKIE], "#{ session_key }="
-    assert_equal response.body, '{"counter"=>1}'
-  end
-
-  it 'determines session from a cookie' do
-    redic = Rack::Session::Redic.new(incrementor)
-    request = Rack::MockRequest.new(redic)
-    response = request.get(ROOT)
-
-    cookie = response[Rack::SET_COOKIE]
-
-    assert_equal request.get(ROOT, Rack::HTTP_COOKIE => cookie).body, '{"counter"=>2}'
-    assert_equal request.get(ROOT, Rack::HTTP_COOKIE => cookie).body, '{"counter"=>3}'
-  end
-
-  it 'determines session only from a cookie by default' do
-    redic = Rack::Session::Redic.new(incrementor)
-    request = Rack::MockRequest.new(redic)
-    response = request.get(ROOT)
-    sid = response[Rack::SET_COOKIE][session_match, 1]
-
-    assert_equal request.get("/?rack.session=#{ sid }").body, '{"counter"=>1}'
-    assert_equal request.get("/?rack.session=#{ sid }").body, '{"counter"=>1}'
-  end
-
-  it 'determines session from params' do
-    redic = Rack::Session::Redic.new(incrementor, cookie_only: false)
-    request = Rack::MockRequest.new(redic)
-    response = request.get(ROOT)
-    sid = response[Rack::SET_COOKIE][session_match, 1]
-
-    assert_equal request.get("/?rack.session=#{ sid }").body, '{"counter"=>2}'
-    assert_equal request.get("/?rack.session=#{ sid }").body, '{"counter"=>3}'
-  end
-
-  it 'survives nonexistant cookies' do
-    bad_cookie = "rack.session=#{ SecureRandom.hex(16) }"
-
-    redic = Rack::Session::Redic.new(incrementor)
-    response = Rack::MockRequest.new(redic).get(ROOT, Rack::HTTP_COOKIE => bad_cookie)
-
-    assert_equal response.body, '{"counter"=>1}'
-
-    cookie = response[Rack::SET_COOKIE][session_match]
-    refute_match(/#{ bad_cookie }/, cookie)
-  end
-
-  it 'maintains freshness' do
-    redic = Rack::Session::Redic.new(incrementor, expire_after: 3)
-    response = Rack::MockRequest.new(redic).get(ROOT)
-    assert_includes response.body, '"counter"=>1'
-
-    cookie = response[Rack::SET_COOKIE]
-    response = Rack::MockRequest.new(redic).get(ROOT, Rack::HTTP_COOKIE => cookie)
-
-    assert_equal response[Rack::SET_COOKIE], cookie
-    assert_includes response.body, '"counter"=>2'
-
-    puts 'Sleeping to expire session' if $DEBUG
-    sleep 4
-
-    response = Rack::MockRequest.new(redic).get(ROOT, Rack::HTTP_COOKIE => cookie)
-    refute_equal response[Rack::SET_COOKIE], cookie
-    assert_includes response.body, '"counter"=>1'
-  end
-
-  it 'does not send the same session id if it did not change' do
-    redic = Rack::Session::Redic.new(incrementor)
-    request = Rack::MockRequest.new(redic)
-
-    res0 = request.get(ROOT)
-    cookie = res0[Rack::SET_COOKIE][session_match]
-    assert_equal res0.body, '{"counter"=>1}'
-
-    res1 = request.get(ROOT, Rack::HTTP_COOKIE => cookie)
-    assert_nil res1[Rack::SET_COOKIE]
-    assert_equal res1.body, '{"counter"=>2}'
-
-    res2 = request.get(ROOT, Rack::HTTP_COOKIE => cookie)
-    assert_nil res2[Rack::SET_COOKIE]
-    assert_equal res2.body, '{"counter"=>3}'
-  end
-
-  it 'deletes cookies with :drop option' do
-    redic = Rack::Session::Redic.new(incrementor)
-    request = Rack::MockRequest.new(redic)
-    drop = Rack::Utils::Context.new(redic, drop_session)
-    dreq = Rack::MockRequest.new(drop)
-
-    res1 = request.get(ROOT)
-    session = (cookie = res1[Rack::SET_COOKIE])[session_match]
-    assert_equal res1.body, '{"counter"=>1}'
-
-    res2 = dreq.get(ROOT, Rack::HTTP_COOKIE => cookie)
-    assert_nil res2[Rack::SET_COOKIE]
-    assert_equal res2.body, '{"counter"=>2}'
-
-    res3 = request.get(ROOT, Rack::HTTP_COOKIE => cookie)
-    refute_equal res3[Rack::SET_COOKIE][session_match], session
-    assert_equal res3.body, '{"counter"=>1}'
-  end
-
-  it 'provides new session id with :renew option' do
-    redic = Rack::Session::Redic.new(incrementor)
-    request = Rack::MockRequest.new(redic)
-    renew = Rack::Utils::Context.new(redic, renew_session)
-    renew_request = Rack::MockRequest.new(renew)
-
-    res1 = request.get(ROOT)
-    session = (cookie = res1[Rack::SET_COOKIE])[session_match]
-    assert_equal res1.body, '{"counter"=>1}'
-
-    res2 = renew_request.get(ROOT, Rack::HTTP_COOKIE => cookie)
-    new_cookie = res2[Rack::SET_COOKIE]
-    new_session = new_cookie[session_match]
-    refute_equal new_session, session
-    assert_equal res2.body, '{"counter"=>2}'
-
-    res3 = request.get(ROOT, Rack::HTTP_COOKIE => new_cookie)
-    assert_equal res3.body, '{"counter"=>3}'
-
-    # Old cookie was deleted
-    res4 = request.get(ROOT, Rack::HTTP_COOKIE => cookie)
-    assert_equal res4.body, '{"counter"=>1}'
-  end
-
-  it 'omits cookie with :defer option but still updates the state' do
-    redic = Rack::Session::Redic.new(incrementor)
-    count = Rack::Utils::Context.new(redic, incrementor)
-    defer = Rack::Utils::Context.new(redic, defer_session)
-    defer_request = Rack::MockRequest.new(defer)
-    count_request = Rack::MockRequest.new(count)
-
-    res0 = defer_request.get(ROOT)
-    assert_nil res0[Rack::SET_COOKIE]
-    assert_equal res0.body, '{"counter"=>1}'
-
-    res0 = count_request.get(ROOT)
-    res1 = defer_request.get(ROOT, Rack::HTTP_COOKIE => res0[Rack::SET_COOKIE])
-    assert_equal res1.body, '{"counter"=>2}'
-    res2 = defer_request.get(ROOT, Rack::HTTP_COOKIE => res0[Rack::SET_COOKIE])
-    assert_equal res2.body, '{"counter"=>3}'
-  end
-
-  it 'omits cookie and state update with :skip option' do
-    redic = Rack::Session::Redic.new(incrementor)
-    count = Rack::Utils::Context.new(redic, incrementor)
-    skip = Rack::Utils::Context.new(redic, skip_session)
-    skip_request = Rack::MockRequest.new(skip)
-    count_request = Rack::MockRequest.new(count)
-
-    res0 = skip_request.get(ROOT)
-    assert_nil res0[Rack::SET_COOKIE]
-    assert_equal res0.body, '{"counter"=>1}'
-
-    res0 = count_request.get(ROOT)
-    res1 = skip_request.get(ROOT, Rack::HTTP_COOKIE => res0[Rack::SET_COOKIE])
-    assert_equal res1.body, '{"counter"=>2}'
-    res2 = skip_request.get(ROOT, Rack::HTTP_COOKIE => res0[Rack::SET_COOKIE])
-    assert_equal res2.body, '{"counter"=>2}'
-  end
-
-  it 'updates deep hashes correctly' do
-    hash_check = proc do |env|
-      session = env['rack.session']
-
-      if session.include?('test')
-        session[:f][:g][:h] = :j
-      else
-        session.update a: :b, c: { d: :e }, f: { g: { h: :i } }, 'test' => true
-      end
-
-      [200, {}, [session.inspect]]
-    end
-
-    redic = Rack::Session::Redic.new(hash_check)
-    request = Rack::MockRequest.new(redic)
-
-    res0 = request.get(ROOT)
-    session_id = (cookie = res0[Rack::SET_COOKIE])[session_match, 1]
-    ses0 = redic.storage.call('GET', session_id)
-
-    request.get(ROOT, Rack::HTTP_COOKIE => cookie)
-    ses1 = redic.storage.call('GET', session_id)
-
-    refute_equal ses1, ses0
-  end
-end