dalli 3.0.4 → 3.0.5

data/lib/dalli.rb

@@ -1,33 +1,33 @@
 # frozen_string_literal: true
 
-require "dalli/compressor"
-require "dalli/client"
-require "dalli/ring"
-require "dalli/protocol"
-require "dalli/protocol/binary"
-require "dalli/protocol/server_config_parser"
-require "dalli/protocol/ttl_sanitizer"
-require 'dalli/protocol/value_compressor'
-require "dalli/socket"
-require "dalli/version"
-require "dalli/options"
-
+##
+# Namespace for all Dalli code.
+##
 module Dalli
-  autoload :Server, "dalli/server"
+  autoload :Server, 'dalli/server'
 
   # generic error
   class DalliError < RuntimeError; end
+
   # socket/server communication error
   class NetworkError < DalliError; end
+
   # no server available/alive error
   class RingError < DalliError; end
+
   # application error in marshalling serialization
   class MarshalError < DalliError; end
+
   # application error in marshalling deserialization or decompression
   class UnmarshalError < DalliError; end
+
   # payload too big for memcached
   class ValueOverMaxSize < DalliError; end
 
+  # Implements the NullObject pattern to store an application-defined value for 'Key not found' responses.
+  class NilObject; end # rubocop:disable Lint/EmptyClass
+  NOT_FOUND = NilObject.new
+
   def self.logger
     @logger ||= (rails_logger || default_logger)
   end
@@ -38,7 +38,7 @@ module Dalli
   end
 
   def self.default_logger
-    require "logger"
+    require 'logger'
     l = Logger.new($stdout)
     l.level = Logger::INFO
     l
@@ -48,3 +48,20 @@ module Dalli
     @logger = logger
   end
 end
+
+require 'dalli/version'
+
+require 'dalli/compressor'
+require 'dalli/client'
+require 'dalli/key_manager'
+require 'dalli/ring'
+require 'dalli/protocol'
+require 'dalli/protocol/binary'
+require 'dalli/protocol/server_config_parser'
+require 'dalli/protocol/ttl_sanitizer'
+require 'dalli/protocol/value_compressor'
+require 'dalli/protocol/value_marshaller'
+require 'dalli/protocol/value_serializer'
+require 'dalli/servers_arg_normalizer'
+require 'dalli/socket'
+require 'dalli/options'

data/lib/rack/session/dalli.rb

@@ -1,17 +1,23 @@
 # frozen_string_literal: true
+
 require 'rack/session/abstract/id'
 require 'dalli'
 require 'connection_pool'
+require 'English'
 
 module Rack
   module Session
+    # Rack::Session::Dalli provides memcached based session management.
     class Dalli < Abstract::Persisted
       attr_reader :pool
 
+      # Don't freeze this until we fix the specs/implementation
+      # rubocop:disable Style/MutableConstant
       DEFAULT_DALLI_OPTIONS = {
-        :namespace => 'rack:session',
-        :memcache_server => 'localhost:11211'
+        namespace: 'rack:session',
+        memcache_server: 'localhost:11211'
       }
+      # rubocop:enable Style/MutableConstant
 
       # Brings in a new Rack::Session::Dalli middleware with the given
       # `:memcache_server`. The server is either a hostname, or a
@@ -67,7 +73,7 @@ module Rack
       # for more information about it and its default options (which would only
       # be applicable if you supplied one of the two options, but not both).
       #
-      def initialize(app, options={})
+      def initialize(app, options = {})
         # Parent uses DEFAULT_OPTIONS to build @default_options for Rack::Session
         super
 
@@ -80,10 +86,12 @@ module Rack
         @pool = ConnectionPool.new(popts || {}) { ::Dalli::Client.new(mserv, mopts) }
       end
 
-      def get_session(env, sid)
+      def get_session(_env, sid)
         with_block([nil, {}]) do |dc|
-          unless sid and !sid.empty? and session = dc.get(sid)
-            old_sid, sid, session = sid, generate_sid_with(dc), {}
+          unless sid && !sid.empty? && (session = dc.get(sid))
+            old_sid = sid
+            sid = generate_sid_with(dc)
+            session = {}
             unless dc.add(sid, session, @default_ttl)
               sid = old_sid
               redo # generate a new sid and try again
@@ -93,7 +101,7 @@ module Rack
         end
       end
 
-      def set_session(env, session_id, new_session, options)
+      def set_session(_env, session_id, new_session, options)
         return false unless session_id
 
         with_block(false) do |dc|
@@ -102,7 +110,7 @@ module Rack
         end
       end
 
-      def destroy_session(env, session_id, options)
+      def destroy_session(_env, session_id, options)
         with_block do |dc|
           dc.delete(session_id)
           generate_sid_with(dc) unless options[:drop]
@@ -124,14 +132,15 @@ module Rack
       private
 
       def extract_dalli_options(options)
-        raise "Rack::Session::Dalli no longer supports the :cache option." if options[:cache]
+        raise 'Rack::Session::Dalli no longer supports the :cache option.' if options[:cache]
 
-        popts = {}
         # Filter out Rack::Session-specific options and apply our defaults
-        mopts = DEFAULT_DALLI_OPTIONS.merge \
-          options.reject {|k, _| DEFAULT_OPTIONS.key? k }
+        # Filter out Rack::Session-specific options and apply our defaults
+        filtered_opts = options.reject { |k, _| DEFAULT_OPTIONS.key? k }
+        mopts = DEFAULT_DALLI_OPTIONS.merge(filtered_opts)
         mserv = mopts.delete :memcache_server
 
+        popts = {}
         if mopts[:pool_size] || mopts[:pool_timeout]
           popts[:size] = mopts.delete :pool_size if mopts[:pool_size]
           popts[:timeout] = mopts.delete :pool_timeout if mopts[:pool_timeout]
@@ -141,20 +150,21 @@ module Rack
         [mserv, mopts, popts]
       end
 
-      def generate_sid_with(dc)
-        while true
+      def generate_sid_with(client)
+        loop do
           sid = generate_sid
-          break sid unless dc.get(sid)
+          break sid unless client.get(sid)
         end
       end
 
-      def with_block(default=nil, &block)
+      def with_block(default = nil, &block)
         @pool.with(&block)
       rescue ::Dalli::DalliError, Errno::ECONNREFUSED
-        raise if $!.message =~ /undefined class/
+        raise if /undefined class/.match?($ERROR_INFO.message)
+
         if $VERBOSE
           warn "#{self} is unable to find memcached server."
-          warn $!.inspect
+          warn $ERROR_INFO.inspect
         end
         default
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dalli
 version: !ruby/object:Gem::Version
-  version: 3.0.4
+  version: 3.0.5
 platform: ruby
 authors:
 - Peter M. Goldstein
@@ -9,8 +9,22 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-10-27 00:00:00.000000000 Z
+date: 2021-11-30 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: connection_pool
+  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: rack
   requirement: !ruby/object:Gem::Requirement
@@ -26,7 +40,49 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: connection_pool
+  name: rubocop
+  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-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-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:
     - - ">="
@@ -55,21 +111,29 @@ files:
 - lib/dalli/cas/client.rb
 - lib/dalli/client.rb
 - lib/dalli/compressor.rb
+- lib/dalli/key_manager.rb
 - lib/dalli/options.rb
 - lib/dalli/protocol.rb
 - lib/dalli/protocol/binary.rb
+- lib/dalli/protocol/binary/request_formatter.rb
+- lib/dalli/protocol/binary/response_processor.rb
+- lib/dalli/protocol/binary/sasl_authentication.rb
 - lib/dalli/protocol/server_config_parser.rb
 - lib/dalli/protocol/ttl_sanitizer.rb
 - lib/dalli/protocol/value_compressor.rb
+- lib/dalli/protocol/value_marshaller.rb
+- lib/dalli/protocol/value_serializer.rb
 - lib/dalli/ring.rb
 - lib/dalli/server.rb
+- lib/dalli/servers_arg_normalizer.rb
 - lib/dalli/socket.rb
 - lib/dalli/version.rb
 - lib/rack/session/dalli.rb
 homepage: https://github.com/petergoldstein/dalli
 licenses:
 - MIT
-metadata: {}
+metadata:
+  rubygems_mfa_required: 'true'
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -78,14 +142,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.30
+rubygems_version: 3.2.31
 signing_key:
 specification_version: 4
 summary: High performance memcached client for Ruby