dalli 3.2.1 → 3.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f81141d870bf96f502734833c9e63678c4f034a2e5cdb6a28bf1fe54b5a6f8f2
-  data.tar.gz: abbb39311cd429b8546397b1c5ba0555024f104e49a6b23fd97b3386408cb5e6
+  metadata.gz: 539a5ec7700d7d96bece70021727ff422d24202ab9e89fd07afc623dc3480502
+  data.tar.gz: ba9231846477125fd3ed77f5a60f0df3445e3cda12c1736cd71f6b299213accb
 SHA512:
-  metadata.gz: 1a6af753aa61a1e80ed734eabb2fa70b8c14e2c1d2fd43a8f95f600732c02d2de08018cb9f41ce776d7796815f8da52fff4a95b05fccb732fe58506d6c38cb2f
-  data.tar.gz: 1724f003506854bc011c90402584a898534059b022de87385e0f8f2b24879897f23d33219f732489212aaf86b58eaa3c6d6ceb4e86c028daacd5180bc3be07ae
+  metadata.gz: 4039d6ce807dc60351f5781438ae84a0d2a147d5af567607653fcfb943ca3d3e0bcfd231cc67dbf4b761a5f0797ba4e5c99e9441d8d1e738eeb356805d139b89
+  data.tar.gz: 5c31e6bc0d5b4b35280f7fd6747172838a8b037209d365906830634b32109a16c0301f732418c2ca99480ff3a37d9247a401c61e1d887ecf11a45dd4448d162b

data/Gemfile

@@ -5,12 +5,5 @@ source 'https://rubygems.org'
 gemspec
 
 group :test do
-  gem 'minitest'
-  gem 'rake'
-  gem 'rubocop'
-  gem 'rubocop-minitest'
-  gem 'rubocop-performance'
-  gem 'rubocop-rake'
   gem 'ruby-prof', platform: :mri
-  gem 'simplecov'
 end

data/History.md

@@ -4,6 +4,11 @@ Dalli Changelog
 Unreleased
 ==========
 
+3.2.2
+==========
+
+- Ensure apps are resilient against old session ids
+
 3.2.1
 ==========
 
@@ -118,6 +123,9 @@ Unreleased
   * The Rack session adapter has been refactored to remove support for thread-unsafe
     configurations. You will need to include the `connection_pool` gem in
     your Gemfile to ensure session operations are thread-safe.
+  * When using namespaces, the algorithm for calculating truncated keys was
+    changed.  Non-truncated keys and truncated keys for the non-namespace
+    case were left unchanged.
 
 - Raise NetworkError when multi response gets into corrupt state (mervync, #783)
 - Validate servers argument (semaperepelitsa, petergoldstein, #776)

data/README.md

@@ -23,7 +23,7 @@ The name is a variant of Salvador Dali for his famous painting [The Persistence
 * [Announcements](https://github.com/petergoldstein/dalli/discussions/categories/announcements) - Announcements of interest to the Dalli community will be posted here.
 * [Bug Reports](https://github.com/petergoldstein/dalli/issues) - If you discover a problem with Dalli, please submit a bug report in the tracker.
 * [Forum](https://github.com/petergoldstein/dalli/discussions/categories/q-a) - If you have questions about Dalli, please post them here.
-* [Client API](https://www.rubydoc.info/github/petergoldstein/dalli/master/Dalli/Client) - Ruby documentation for the `Dalli::Client` API
+* [Client API](https://rubydoc.info/github/petergoldstein/dalli/Dalli/Client) - Ruby documentation for the `Dalli::Client` API
 
 ## Contributing
 

data/lib/dalli/protocol/base.rb

@@ -127,11 +127,11 @@ module Dalli
       end
 
       def username
-        @options[:username] || ENV['MEMCACHE_USERNAME']
+        @options[:username] || ENV.fetch('MEMCACHE_USERNAME', nil)
       end
 
       def password
-        @options[:password] || ENV['MEMCACHE_PASSWORD']
+        @options[:password] || ENV.fetch('MEMCACHE_PASSWORD', nil)
       end
 
       def require_auth?

data/lib/dalli/servers_arg_normalizer.rb

@@ -40,7 +40,7 @@ module Dalli
     def self.apply_defaults(arg)
       return arg unless arg.nil?
 
-      ENV[ENV_VAR_NAME] || DEFAULT_SERVERS
+      ENV.fetch(ENV_VAR_NAME, nil) || DEFAULT_SERVERS
     end
 
     def self.validate_type(arg)

data/lib/dalli/version.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Dalli
-  VERSION = '3.2.1'
+  VERSION = '3.2.2'
 
   MIN_SUPPORTED_MEMCACHED_VERSION = '1.4'
 end

data/lib/rack/session/dalli.rb

@@ -82,6 +82,9 @@ module Rack
       def write_session(_req, sid, session, options)
         return false unless sid
 
+        key = memcached_key_from_sid(sid)
+        return false unless key
+
         with_dalli_client(false) do |dc|
           dc.set(memcached_key_from_sid(sid), session, ttl(options[:expire_after]))
           sid
@@ -90,7 +93,8 @@ module Rack
 
       def delete_session(_req, sid, options)
         with_dalli_client do |dc|
-          dc.delete(memcached_key_from_sid(sid))
+          key = memcached_key_from_sid(sid)
+          dc.delete(key) if key
           generate_sid_with(dc) unless options[:drop]
         end
       end
@@ -98,20 +102,24 @@ module Rack
       private
 
       def memcached_key_from_sid(sid)
-        sid.private_id
+        sid.private_id if sid.respond_to?(:private_id)
       end
 
       def existing_session_for_sid(client, sid)
         return nil unless sid && !sid.empty?
 
-        client.get(memcached_key_from_sid(sid))
+        key = memcached_key_from_sid(sid)
+        return nil if key.nil?
+
+        client.get(key)
       end
 
       def create_sid_with_empty_session(client)
         loop do
           sid = generate_sid_with(client)
+          key = memcached_key_from_sid(sid)
 
-          break sid if client.add(memcached_key_from_sid(sid), {}, @default_ttl)
+          break sid if key && client.add(key, {}, @default_ttl)
         end
       end
 
@@ -119,7 +127,8 @@ module Rack
         loop do
           raw_sid = generate_sid
           sid = raw_sid.is_a?(String) ? Rack::Session::SessionId.new(raw_sid) : raw_sid
-          break sid unless client.get(memcached_key_from_sid(sid))
+          key = memcached_key_from_sid(sid)
+          break sid unless key && client.get(key)
         end
       end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dalli
 version: !ruby/object:Gem::Version
-  version: 3.2.1
+  version: 3.2.2
 platform: ruby
 authors:
 - Peter M. Goldstein
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-02-14 00:00:00.000000000 Z
+date: 2022-06-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: connection_pool
@@ -25,6 +25,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5'
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
@@ -45,6 +59,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 2.2.0
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '13.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
@@ -101,6 +129,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  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: High performance memcached client for Ruby
 email:
 - peter.m.goldstein@gmail.com
@@ -164,7 +206,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.3.16
 signing_key:
 specification_version: 4
 summary: High performance memcached client for Ruby