rails-session_cookie 0.2.0 → 0.3.0

data/gemfiles/rails_7.0.gemfile

@@ -0,0 +1,22 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rspec"
+gem "rspec-rails", "6.0.0.rc1"
+gem "rspec-benchmark", "~> 0.3"
+gem "rspec-github", "~> 2.3"
+gem "rubocop", "~> 1.29"
+gem "rubocop-rake", "~> 0.6"
+gem "rubocop-rspec", "~> 2.10"
+gem "rubocop-performance", "~> 1.13"
+gem "simplecov", "~> 0.21"
+gem "codecov", require: false
+gem "sqlite3", "~> 1.4"
+gem "capybara", "~> 2.15", require: false
+gem "benchmark-ips", "~> 2.7", require: false
+gem "rake"
+gem "appraisal", "~> 2.4", require: false
+gem "rails", "~> 7.0.3"
+
+gemspec path: "../"

data/gemfiles/rails_7.0_warden.gemfile

@@ -0,0 +1,24 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rspec"
+gem "rspec-rails", "6.0.0.rc1"
+gem "rspec-benchmark", "~> 0.3"
+gem "rspec-github", "~> 2.3"
+gem "rubocop", "~> 1.29"
+gem "rubocop-rake", "~> 0.6"
+gem "rubocop-rspec", "~> 2.10"
+gem "rubocop-performance", "~> 1.13"
+gem "simplecov", "~> 0.21"
+gem "codecov", require: false
+gem "sqlite3", "~> 1.4"
+gem "capybara", "~> 2.15", require: false
+gem "benchmark-ips", "~> 2.7", require: false
+gem "rake"
+gem "appraisal", "~> 2.4", require: false
+gem "rails", "~> 7.0.3"
+gem "warden", ">= 1.2"
+gem "devise", "~> 4.8"
+
+gemspec path: "../"

data/lib/rails/session_cookie/app.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'action_dispatch'
 
 module Rails
@@ -20,7 +22,7 @@ module Rails
         }
       end
 
-      attr_reader :app, :rails_app
+      attr_reader :app
 
       def initialize(app, session_options = nil)
         auth_session_options = session_options || rails_app.config.session_options
@@ -35,7 +37,7 @@ module Rails
       end
 
       def call(env = {})
-        app.call(default_env.merge(env).dup)
+        app.call(default_env.merge(Env.new(env).env).dup)
       end
 
       def session_cookie(env = {})
@@ -58,7 +60,7 @@ module Rails
       end
 
       def rails_app
-        @rails_app ||= defined?(Rails) && Rails.application || raise(NoRailsApplication)
+        @rails_app ||= (defined?(Rails) && Rails.application) || raise(NoRailsApplication)
       end
     end
   end

data/lib/rails/session_cookie/env.rb

@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+require 'action_dispatch'
+require 'active_support'
+
+module Rails
+  module SessionCookie
+    # This merges proper key generator if SECRET_KEY_BASE is explicit
+    # and generates additional request env
+    class Env
+      def self.rails_key_generator(secret_key_base)
+        ActiveSupport::CachingKeyGenerator.new(ActiveSupport::KeyGenerator.new(secret_key_base, iterations: 1000))
+      end
+
+      def initialize(env = nil)
+        @env = env || {}
+      end
+
+      def env
+        return @env unless secret_key_base
+
+        @env.merge(
+          ActionDispatch::Cookies::SECRET_KEY_BASE => secret_key_base,
+          ActionDispatch::Cookies::GENERATOR_KEY => key_generator
+        )
+      end
+
+      private
+
+      # rails caches secret_key_base and key_generator
+      def key_generator
+        self.class.rails_key_generator(secret_key_base)
+      end
+
+      def secret_key_base
+        @secret_key_base ||= @env.fetch(:secret_key_base, nil) || @env.fetch(ActionDispatch::Cookies::SECRET_KEY_BASE, nil)
+      end
+    end
+  end
+end

data/lib/rails/session_cookie/version.rb

@@ -1,5 +1,7 @@
+# frozen_string_literal: true
+
 module Rails
   module SessionCookie
-    VERSION = '0.2.0'.freeze
+    VERSION = '0.3.0'
   end
 end

data/lib/rails/session_cookie/warden_app.rb

@@ -1,4 +1,12 @@
-require 'warden'
+# frozen_string_literal: true
+
+# rubocop:disable Lint/SuppressedException
+begin
+  require 'warden'
+rescue LoadError
+end
+# rubocop:enable Lint/SuppressedException
+
 require 'rails/session_cookie/app'
 
 module Rails
@@ -17,7 +25,7 @@ module Rails
           [200, {}, []]
         }
 
-        @app = with_middlewares(auth_app, auth_session_options)
+        super(auth_app, auth_session_options)
       end
     end
   end

data/lib/rails/session_cookie.rb

@@ -1,11 +1,14 @@
+# frozen_string_literal: true
+
+require 'rails/session_cookie/env'
 require 'rails/session_cookie/app'
-require 'rails/session_cookie/warden_app' if defined? Warden
+require 'rails/session_cookie/warden_app'
 require 'rails/session_cookie/version'
 
 module Rails
   # :nodoc:
   module SessionCookie
     NoRailsApplication = Class.new(StandardError)
-    RACK_SESSION = 'rack.session'.freeze # upstream constant name is changing
+    RACK_SESSION = 'rack.session' # upstream constant name is changing
   end
 end

data/lib/rails-session_cookie.rb

@@ -0,0 +1 @@
+require 'rails/session_cookie'

data/rails-session_cookie.gemspec

@@ -1,6 +1,6 @@
-# coding: utf-8
+# frozen_string_literal: true
 
-lib = File.expand_path('../lib', __FILE__)
+lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'rails/session_cookie/version'
 
@@ -22,18 +22,4 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_dependency 'rails', '>= 4.0'
-
-  spec.add_development_dependency 'bundler', '~> 1.15'
-  spec.add_development_dependency 'rake', '~> 10.0'
-  spec.add_development_dependency 'rspec', '~> 3.0'
-  spec.add_development_dependency 'appraisal', '~> 2.2'
-  spec.add_development_dependency 'rubocop', '~> 0.49'
-  spec.add_development_dependency 'rspec-rails', '~> 3.6.1'
-  spec.add_development_dependency 'codeclimate-test-reporter', '= 1.0.8'
-  spec.add_development_dependency 'simplecov', '= 0.13.0'
-  spec.add_development_dependency 'sqlite3', '~> 1.3'
-
-  # bench
-  spec.add_development_dependency 'rspec-benchmark', '~> 0.3'
-  spec.add_development_dependency 'capybara', '~> 2.15'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails-session_cookie
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Vlad Bokov
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2017-09-04 00:00:00.000000000 Z
+date: 2022-05-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -24,160 +24,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '4.0'
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.15'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.15'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '10.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '10.0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: appraisal
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.2'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.2'
-- !ruby/object:Gem::Dependency
-  name: rubocop
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.49'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.49'
-- !ruby/object:Gem::Dependency
-  name: rspec-rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 3.6.1
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 3.6.1
-- !ruby/object:Gem::Dependency
-  name: codeclimate-test-reporter
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.0.8
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.0.8
-- !ruby/object:Gem::Dependency
-  name: simplecov
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.13.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.13.0
-- !ruby/object:Gem::Dependency
-  name: sqlite3
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.3'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.3'
-- !ruby/object:Gem::Dependency
-  name: rspec-benchmark
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.3'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.3'
-- !ruby/object:Gem::Dependency
-  name: capybara
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.15'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.15'
 description: Helps to get proper integration tests run faster
 email:
 - razum2um@mail.ru
@@ -186,38 +32,38 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".codeclimate.yml"
+- ".github/workflows/branch.yml"
+- ".github/workflows/ci.yml"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
-- ".travis.yml"
 - Appraisals
 - Gemfile
+- LICENSE
 - README.md
 - Rakefile
 - bin/console
 - bin/setup
 - gemfiles/.bundle/config
-- gemfiles/rails_4.2.gemfile
-- gemfiles/rails_4.2.gemfile.lock
-- gemfiles/rails_4.2_warden.gemfile
-- gemfiles/rails_4.2_warden.gemfile.lock
-- gemfiles/rails_5.0.gemfile
-- gemfiles/rails_5.0.gemfile.lock
-- gemfiles/rails_5.0_warden.gemfile
-- gemfiles/rails_5.0_warden.gemfile.lock
-- gemfiles/rails_5.1.gemfile
-- gemfiles/rails_5.1.gemfile.lock
-- gemfiles/rails_5.1_warden.gemfile
-- gemfiles/rails_5.1_warden.gemfile.lock
+- gemfiles/rails_5.2.gemfile
+- gemfiles/rails_5.2_warden.gemfile
+- gemfiles/rails_6.0.gemfile
+- gemfiles/rails_6.0_warden.gemfile
+- gemfiles/rails_6.1.gemfile
+- gemfiles/rails_6.1_warden.gemfile
+- gemfiles/rails_7.0.gemfile
+- gemfiles/rails_7.0_warden.gemfile
+- lib/rails-session_cookie.rb
 - lib/rails/session_cookie.rb
 - lib/rails/session_cookie/app.rb
+- lib/rails/session_cookie/env.rb
 - lib/rails/session_cookie/version.rb
 - lib/rails/session_cookie/warden_app.rb
 - rails-session_cookie.gemspec
 homepage: https://github.com/razum2um/rails/session_cookie
 licenses: []
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -232,9 +78,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.11
-signing_key: 
+rubygems_version: 3.3.7
+signing_key:
 specification_version: 4
 summary: Mini rack-app to get raw rails session cookie
 test_files: []

data/.travis.yml

@@ -1,18 +0,0 @@
-sudo: false
-cache: bundler
-language: ruby
-rvm:
-  - 2.4.1
-  - 2.3.4
-  - 2.2.7
-gemfile:
-  - gemfiles/rails_4.2.gemfile
-  - gemfiles/rails_4.2_warden.gemfile
-  - gemfiles/rails_5.0.gemfile
-  - gemfiles/rails_5.0_warden.gemfile
-  - gemfiles/rails_5.1.gemfile
-  - gemfiles/rails_5.1_warden.gemfile
-before_install: gem install bundler -v 1.15.4
-script:
-  - bundle exec rake
-  - bundle exec codeclimate-test-reporter

data/gemfiles/rails_4.2.gemfile

@@ -1,8 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "pry-byebug"
-gem "rails", "~> 4.2.9"
-
-gemspec path: "../"

data/gemfiles/rails_4.2.gemfile.lock

@@ -1,202 +0,0 @@
-PATH
-  remote: ..
-  specs:
-    rails-session_cookie (0.1.0)
-      rails (>= 4.0)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    actionmailer (4.2.9)
-      actionpack (= 4.2.9)
-      actionview (= 4.2.9)
-      activejob (= 4.2.9)
-      mail (~> 2.5, >= 2.5.4)
-      rails-dom-testing (~> 1.0, >= 1.0.5)
-    actionpack (4.2.9)
-      actionview (= 4.2.9)
-      activesupport (= 4.2.9)
-      rack (~> 1.6)
-      rack-test (~> 0.6.2)
-      rails-dom-testing (~> 1.0, >= 1.0.5)
-      rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (4.2.9)
-      activesupport (= 4.2.9)
-      builder (~> 3.1)
-      erubis (~> 2.7.0)
-      rails-dom-testing (~> 1.0, >= 1.0.5)
-      rails-html-sanitizer (~> 1.0, >= 1.0.3)
-    activejob (4.2.9)
-      activesupport (= 4.2.9)
-      globalid (>= 0.3.0)
-    activemodel (4.2.9)
-      activesupport (= 4.2.9)
-      builder (~> 3.1)
-    activerecord (4.2.9)
-      activemodel (= 4.2.9)
-      activesupport (= 4.2.9)
-      arel (~> 6.0)
-    activesupport (4.2.9)
-      i18n (~> 0.7)
-      minitest (~> 5.1)
-      thread_safe (~> 0.3, >= 0.3.4)
-      tzinfo (~> 1.1)
-    addressable (2.5.2)
-      public_suffix (>= 2.0.2, < 4.0)
-    appraisal (2.2.0)
-      bundler
-      rake
-      thor (>= 0.14.0)
-    arel (6.0.4)
-    ast (2.3.0)
-    benchmark-perf (0.2.1)
-    builder (3.2.3)
-    byebug (9.0.6)
-    capybara (2.15.1)
-      addressable
-      mini_mime (>= 0.1.3)
-      nokogiri (>= 1.3.3)
-      rack (>= 1.0.0)
-      rack-test (>= 0.5.4)
-      xpath (~> 2.0)
-    codeclimate-test-reporter (1.0.8)
-      simplecov (<= 0.13)
-    coderay (1.1.1)
-    concurrent-ruby (1.0.5)
-    diff-lcs (1.3)
-    docile (1.1.5)
-    erubis (2.7.0)
-    globalid (0.4.0)
-      activesupport (>= 4.2.0)
-    i18n (0.8.6)
-    json (2.1.0)
-    loofah (2.0.3)
-      nokogiri (>= 1.5.9)
-    mail (2.6.6)
-      mime-types (>= 1.16, < 4)
-    method_source (0.8.2)
-    mime-types (3.1)
-      mime-types-data (~> 3.2015)
-    mime-types-data (3.2016.0521)
-    mini_mime (0.1.4)
-    mini_portile2 (2.2.0)
-    minitest (5.10.3)
-    nokogiri (1.8.0)
-      mini_portile2 (~> 2.2.0)
-    parallel (1.12.0)
-    parser (2.4.0.0)
-      ast (~> 2.2)
-    powerpack (0.1.1)
-    pry (0.10.4)
-      coderay (~> 1.1.0)
-      method_source (~> 0.8.1)
-      slop (~> 3.4)
-    pry-byebug (3.4.2)
-      byebug (~> 9.0)
-      pry (~> 0.10)
-    public_suffix (3.0.0)
-    rack (1.6.8)
-    rack-test (0.6.3)
-      rack (>= 1.0)
-    rails (4.2.9)
-      actionmailer (= 4.2.9)
-      actionpack (= 4.2.9)
-      actionview (= 4.2.9)
-      activejob (= 4.2.9)
-      activemodel (= 4.2.9)
-      activerecord (= 4.2.9)
-      activesupport (= 4.2.9)
-      bundler (>= 1.3.0, < 2.0)
-      railties (= 4.2.9)
-      sprockets-rails
-    rails-deprecated_sanitizer (1.0.3)
-      activesupport (>= 4.2.0.alpha)
-    rails-dom-testing (1.0.8)
-      activesupport (>= 4.2.0.beta, < 5.0)
-      nokogiri (~> 1.6)
-      rails-deprecated_sanitizer (>= 1.0.1)
-    rails-html-sanitizer (1.0.3)
-      loofah (~> 2.0)
-    railties (4.2.9)
-      actionpack (= 4.2.9)
-      activesupport (= 4.2.9)
-      rake (>= 0.8.7)
-      thor (>= 0.18.1, < 2.0)
-    rainbow (2.2.2)
-      rake
-    rake (10.5.0)
-    rspec (3.6.0)
-      rspec-core (~> 3.6.0)
-      rspec-expectations (~> 3.6.0)
-      rspec-mocks (~> 3.6.0)
-    rspec-benchmark (0.3.0)
-      benchmark-perf (~> 0.2.0)
-      rspec (>= 3.0.0, < 4.0.0)
-    rspec-core (3.6.0)
-      rspec-support (~> 3.6.0)
-    rspec-expectations (3.6.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.6.0)
-    rspec-mocks (3.6.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.6.0)
-    rspec-rails (3.6.1)
-      actionpack (>= 3.0)
-      activesupport (>= 3.0)
-      railties (>= 3.0)
-      rspec-core (~> 3.6.0)
-      rspec-expectations (~> 3.6.0)
-      rspec-mocks (~> 3.6.0)
-      rspec-support (~> 3.6.0)
-    rspec-support (3.6.0)
-    rubocop (0.49.1)
-      parallel (~> 1.10)
-      parser (>= 2.3.3.1, < 3.0)
-      powerpack (~> 0.1)
-      rainbow (>= 1.99.1, < 3.0)
-      ruby-progressbar (~> 1.7)
-      unicode-display_width (~> 1.0, >= 1.0.1)
-    ruby-progressbar (1.8.1)
-    simplecov (0.13.0)
-      docile (~> 1.1.0)
-      json (>= 1.8, < 3)
-      simplecov-html (~> 0.10.0)
-    simplecov-html (0.10.2)
-    slop (3.6.0)
-    sprockets (3.7.1)
-      concurrent-ruby (~> 1.0)
-      rack (> 1, < 3)
-    sprockets-rails (3.2.1)
-      actionpack (>= 4.0)
-      activesupport (>= 4.0)
-      sprockets (>= 3.0.0)
-    sqlite3 (1.3.13)
-    thor (0.20.0)
-    thread_safe (0.3.6)
-    tzinfo (1.2.3)
-      thread_safe (~> 0.1)
-    unicode-display_width (1.3.0)
-    xpath (2.1.0)
-      nokogiri (~> 1.3)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  appraisal (~> 2.2)
-  bundler (~> 1.15)
-  capybara (~> 2.15)
-  codeclimate-test-reporter (= 1.0.8)
-  pry-byebug
-  rails (~> 4.2.9)
-  rails-session_cookie!
-  rake (~> 10.0)
-  rspec (~> 3.0)
-  rspec-benchmark (~> 0.3)
-  rspec-rails (~> 3.6.1)
-  rubocop (~> 0.49)
-  simplecov (= 0.13.0)
-  sqlite3 (~> 1.3)
-
-BUNDLED WITH
-   1.15.4

data/gemfiles/rails_4.2_warden.gemfile

@@ -1,10 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "pry-byebug"
-gem "rails", "~> 4.2.9"
-gem "warden", ">= 1.2"
-gem "devise", "~> 4.3"
-
-gemspec path: "../"