rack-session 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ca669bfeeda8e9b9d563ae88f899301acc7d8df1bfebb6768762edc9e99fb895
-  data.tar.gz: 16170181b6d0eb480807ccff0cbd04ad4d8208a33251317ecdd1da202ed1076c
+  metadata.gz: bb2330b8031f50a3d80ca25857aac9db3636ed03d90aad824c8a191ec74cb4a3
+  data.tar.gz: 40323d8725c0a23f017d2017c29ee3abfa2fb811b13d12492d62e28e2a6b8274
 SHA512:
-  metadata.gz: fc97739262aca4442a56ff5ad029adeb20f461637fd8730f819f0c8c5faa0e0aef736d64366031312393e04cfce44ec9b44c5a6bb4548b75be85c2c89a8f6d3d
-  data.tar.gz: dbcbf050c12610a82a37a02fa1f2e75b46cb5d2d0644b6a1e55175a76feca1afe7780746f04dd91575d54665ff2d0983eb262c37ed6291eac8a214b2e8071db3
+  metadata.gz: 227c65c2acd9f8f05d76a424200e2c151006fb37ef271fde09f4ac73abb5ef8fc91dd9accf75cc901e9d09bc1347a38990dbe590d8f017fa59a4cb67e1b70536
+  data.tar.gz: dc24af294baf201629cc0ddd362cbe614acda5408acdb48be12e00b1ba8d567ee69a6f2d831cbc35a3e7b389f06a44e2b2c65234143686e5ab4f5ce6dbe7eb94

data/lib/rack/session/abstract/id.rb

@@ -11,6 +11,8 @@ require 'rack/constants'
 require 'rack/request'
 require 'rack/response'
 
+require_relative '../constants'
+
 module Rack
 
   module Session
@@ -415,10 +417,9 @@ module Rack
         # Sets the cookie back to the client with session id. We skip the cookie
         # setting if the value didn't change (sid is the same) or expires was given.
 
-        def set_cookie(request, res, cookie)
+        def set_cookie(request, response, cookie)
           if request.cookies[@key] != cookie[:value] || cookie[:expires]
-            res.set_cookie_header =
-              Utils.add_cookie_to_header(res.set_cookie_header, @key, cookie)
+            response.set_cookie(@key, cookie)
           end
         end
 

data/lib/rack/session/constants.rb

@@ -1,6 +1,7 @@
-
 module Rack
   module Session
+    RACK_SESSION                        = 'rack.session'
+    RACK_SESSION_OPTIONS                = 'rack.session.options'
     RACK_SESSION_UNPACKED_COOKIE_DATA   = 'rack.session.unpacked_cookie_data'
   end
 end

data/lib/rack/session/cookie.rb

@@ -11,6 +11,7 @@ require 'rack/utils'
 
 require_relative 'abstract/id'
 require_relative 'encryptor'
+require_relative 'constants'
 
 module Rack
 
@@ -151,7 +152,8 @@ module Rack
       attr_reader :coder, :encryptors
 
       def initialize(app, options = {})
-        secrets = [*options[:secrets]]
+        # support both :secrets and :secret for backwards compatibility
+        secrets = [*(options[:secrets] || options[:secret])]
 
         encryptor_opts = {
           purpose: options[:key], serialize_json: options[:serialize_json]
@@ -163,11 +165,12 @@ module Rack
           Rack::Session::Encryptor.new secret, encryptor_opts
         end
 
-        # If a legacy HMAC secret is present, initialize those features
-        if options.has_key?(:legacy_hmac_secret)
+        # If a legacy HMAC secret is present, initialize those features.
+        # Fallback to :secret for backwards compatibility.
+        if options.has_key?(:legacy_hmac_secret) || options.has_key?(:secret)
           @legacy_hmac = options.fetch(:legacy_hmac, 'SHA1')
 
-          @legacy_hmac_secret = options[:legacy_hmac_secret]
+          @legacy_hmac_secret = options[:legacy_hmac_secret] || options[:secret]
           @legacy_hmac_coder  = options.fetch(:legacy_hmac_coder, Base64::Marshal.new)
         else
           @legacy_hmac = false

data/lib/rack/session/version.rb

@@ -13,6 +13,6 @@
 
 module Rack
   module Session
-    VERSION = "0.1.0"
+    VERSION = "0.2.0"
   end
 end

data/lib/rack/session.rb

@@ -1,6 +1,7 @@
-
 module Rack
-  RACK_SESSION                        = 'rack.session'
-  RACK_SESSION_OPTIONS                = 'rack.session.options'
-  RACK_SESSION_UNPACKED_COOKIE_DATA   = 'rack.session.unpacked_cookie_data'
+  module Session
+    autoload :Cookie, "rack/session/cookie"
+    autoload :Pool, "rack/session/pool"
+    autoload :Memcache, "rack/session/memcache"
+  end
 end

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: rack-session
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Rack Contributors
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-02-17 00:00:00.000000000 Z
+date: 2022-08-03 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: rack
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -91,7 +105,6 @@ files:
 - lib/rack/session/constants.rb
 - lib/rack/session/cookie.rb
 - lib/rack/session/encryptor.rb
-- lib/rack/session/memcache.rb
 - lib/rack/session/pool.rb
 - lib/rack/session/version.rb
 homepage: https://github.com/rack/rack-session
@@ -113,7 +126,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.0.dev
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: A session implementation for Rack.

data/lib/rack/session/memcache.rb

@@ -1,10 +0,0 @@
-# frozen_string_literal: true
-
-require 'rack/session/dalli'
-
-module Rack
-  module Session
-    warn "Rack::Session::Memcache is deprecated, please use Rack::Session::Dalli from 'dalli' gem instead."
-    Memcache = Dalli
-  end
-end