dalli 2.7.5 → 2.7.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 29b86664473df52d0ca07fbf21015a39260962a1
-  data.tar.gz: 5061af271bef6e1db864d5e6de4f9464412e0c67
+  metadata.gz: aa780eecd8063c6371f755a081c672bee694c596
+  data.tar.gz: f044315c06b99f3ff10da4c4a37a4b77cce359da
 SHA512:
-  metadata.gz: 7ccec720347f06a142f74d1a500948390f0dcd3520c73922363267c393d99067cb3682f4c2577cc2cbbd99a18a93f800041eaec7570303c73d5e7ab451b9396e
-  data.tar.gz: a68483e89e28c82d52852d73c921aa40578abad55a2f3ec9106b01f1fd5dfc6f98104e9b2f8ab0006306685a4b3ecafca3d768ebf81223c213171482ee00d1f1
+  metadata.gz: 962196b3d7c2a75b928f32e896106ead0316b6d2614f1176041a3751c82816e5669a70d9d293ef1762df190bade229955b20c5673562600575774b3bfed6c978
+  data.tar.gz: c890f77ce55953a3f0fe47629ddb1eda40ece7b58628c7168e45c3733c5120e72c7dba992f6b15267ea5025283bf8f5c2e213648c65e6a87131219bfe318f5a1

data/History.md

@@ -1,6 +1,13 @@
 Dalli Changelog
 =====================
 
+2.7.6
+==========
+- Rails 5.0.0.beta2 compatibility (yui-knk, petergoldstein)
+- Add cas!, a variant of the #cas method that yields to the block whether or not the key already exist (mwpastore)
+- Performance improvements (nateberkopec)
+- Add Ruby 2.3.0 to support matrix (tricknotes)
+
 2.7.5
 ==========
 

data/lib/active_support/cache/dalli_store.rb

@@ -336,6 +336,7 @@ module ActiveSupport
         key = "#{prefix}:#{key}" if prefix
         key
       end
+      alias :normalize_key :namespaced_key
 
       # Expand key to be a consistent string value. Invoke +cache_key+ if
       # object responds to +cache_key+. Otherwise, to_param method will be

data/lib/dalli/client.rb

@@ -107,13 +107,19 @@ module Dalli
     # - nil if the key did not exist.
     # - false if the value was changed by someone else.
     # - true if the value was successfully updated.
-    def cas(key, ttl=nil, options=nil)
-      (value, cas) = perform(:cas, key)
-      value = (!value || value == 'Not found') ? nil : value
-      if value
-        newvalue = yield(value)
-        perform(:set, key, newvalue, ttl_or_default(ttl), cas, options)
-      end
+    def cas(key, ttl=nil, options=nil, &block)
+      cas_core(key, false, ttl, options, &block)
+    end
+
+    ##
+    # like #cas, but will yield to the block whether or not the value
+    # already exists.
+    #
+    # Returns:
+    # - false if the value was changed by someone else.
+    # - true if the value was successfully updated.
+    def cas!(key, ttl=nil, options=nil, &block)
+      cas_core(key, true, ttl, options, &block)
     end
 
     def set(key, value, ttl=nil, options=nil)
@@ -258,6 +264,14 @@ module Dalli
 
     private
 
+    def cas_core(key, always_set, ttl=nil, options=nil)
+      (value, cas) = perform(:cas, key)
+      value = (!value || value == 'Not found') ? nil : value
+      return if value.nil? && !always_set
+      newvalue = yield(value)
+      perform(:set, key, newvalue, ttl_or_default(ttl), cas, options)
+    end
+
     def ttl_or_default(ttl)
       (ttl || @options[:expires_in]).to_i
     rescue NoMethodError
@@ -337,8 +351,8 @@ module Dalli
     end
 
     # Chokepoint method for instrumentation
-    def perform(*all_args, &blk)
-      return blk.call if blk
+    def perform(*all_args)
+      return yield if block_given?
       op, key, *args = *all_args
 
       key = key.to_s
@@ -408,7 +422,7 @@ module Dalli
             servers = perform_multi_response_start(servers)
 
             start = Time.now
-            loop do
+            while true
               # remove any dead servers
               servers.delete_if { |s| s.sock.nil? }
               break if servers.empty?

data/lib/dalli/ring.rb

@@ -46,11 +46,11 @@ module Dalli
     end
 
     def lock
-      @servers.each { |s| s.lock! }
+      @servers.each(&:lock!)
       begin
         return yield
       ensure
-        @servers.each { |s| s.unlock! }
+        @servers.each(&:unlock!)
       end
     end
 

data/lib/dalli/server.rb

@@ -528,7 +528,7 @@ module Dalli
 
     def keyvalue_response
       hash = {}
-      loop do
+      while true
         (key_length, _, body_length, _) = read_header.unpack(KV_HEADER)
         return hash if key_length == 0
         key = read(key_length)
@@ -539,7 +539,7 @@ module Dalli
 
     def multi_response
       hash = {}
-      loop do
+      while true
         (key_length, _, body_length, _) = read_header.unpack(KV_HEADER)
         return hash if key_length == 0
         flags = read(4).unpack('N')[0]
@@ -603,6 +603,8 @@ module Dalli
     REQUEST = 0x80
     RESPONSE = 0x81
 
+    # Response codes taken from:
+    # https://code.google.com/p/memcached/wiki/BinaryProtocolRevamped#Response_Status
     RESPONSE_CODES = {
       0 => 'No error',
       1 => 'Key not found',
@@ -611,9 +613,16 @@ module Dalli
       4 => 'Invalid arguments',
       5 => 'Item not stored',
       6 => 'Incr/decr on a non-numeric value',
+      7 => 'The vbucket belongs to another server',
+      8 => 'Authentication error',
+      9 => 'Authentication continue',
       0x20 => 'Authentication required',
       0x81 => 'Unknown command',
       0x82 => 'Out of memory',
+      0x83 => 'Not supported',
+      0x84 => 'Internal error',
+      0x85 => 'Busy',
+      0x86 => 'Temporary failure'
     }
 
     OPCODES = {

data/lib/dalli/socket.rb

@@ -28,7 +28,7 @@ begin
 
     def readfull(count)
       value = ''
-      loop do
+      while true
         value << kgio_read!(count - value.bytesize)
         break if value.bytesize == count
       end
@@ -37,7 +37,7 @@ begin
 
     def read_available
       value = ''
-      loop do
+      while true
         ret = kgio_tryread(8196)
         case ret
         when nil
@@ -90,7 +90,7 @@ rescue LoadError
       def readfull(count)
         value = ''
         begin
-          loop do
+          while true
             value << read_nonblock(count - value.bytesize)
             break if value.bytesize == count
           end
@@ -106,7 +106,7 @@ rescue LoadError
 
       def read_available
         value = ''
-        loop do
+        while true
           begin
             value << read_nonblock(8196)
           rescue Errno::EAGAIN, Errno::EWOULDBLOCK

data/lib/dalli/version.rb

@@ -1,3 +1,3 @@
 module Dalli
-  VERSION = '2.7.5'
+  VERSION = '2.7.6'
 end

data/lib/rack/session/dalli.rb

@@ -3,7 +3,7 @@ require 'dalli'
 
 module Rack
   module Session
-    class Dalli < Abstract::ID
+    class Dalli < defined?(Abstract::Persisted) ? Abstract::Persisted : Abstract::ID
       attr_reader :pool, :mutex
 
       DEFAULT_OPTIONS = Abstract::ID::DEFAULT_OPTIONS.merge \
@@ -19,8 +19,22 @@ module Rack
         @pool.alive!
       end
 
+      if defined?(Abstract::Persisted)
+        def find_session(req, sid)
+          get_session req.env, sid
+        end
+
+        def write_session(req, sid, session, options)
+          set_session req.env, sid, session, options
+        end
+
+        def delete_session(req, sid, options)
+          destroy_session req.env, sid, options
+        end
+      end
+
       def generate_sid
-        loop do
+        while true
           sid = super
           break sid unless @pool.get(sid)
         end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dalli
 version: !ruby/object:Gem::Version
-  version: 2.7.5
+  version: 2.7.6
 platform: ruby
 authors:
 - Peter M. Goldstein
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-16 00:00:00.000000000 Z
+date: 2016-02-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -169,7 +169,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: High performance memcached client for Ruby