dalli 2.6.3 → 2.6.4

data/History.md

@@ -1,6 +1,13 @@
 Dalli Changelog
 =====================
 
+HEAD
+=======
+
+- Fix ADD command, aka `write(unless_exist: true)` (pitr, #365)
+- Upgrade test suite from mini_shoulda to minitest.
+- Even more performance improvements for get\_multi (xaop, #331)
+
 2.6.3
 =======
 

data/README.md

@@ -55,11 +55,14 @@ On Ubuntu you can install it by running:
 
 You can verify your installation using this piece of code:
 
-```ruby
+```bash
 gem install dalli
+```
 
+```ruby
 require 'dalli'
-dc = Dalli::Client.new('localhost:11211')
+options = { :namespace => "app_v1", :compress => true }
+dc = Dalli::Client.new('localhost:11211', options)
 dc.set('abc', 123)
 value = dc.get('abc')
 ```
@@ -141,7 +144,7 @@ Default is Marshal.
 
 **password**: The password to use for authenticating this client instance against a SASL-enabled memcached server.  Heroku users should not need to use this normally.
 
-**keepalive**: Boolean. If true, Dalli will enable keep-alive for socket connections.  Default is false.
+**keepalive**: Boolean. If true, Dalli will enable keep-alive for socket connections.  Default is true.
 
 **compressor**: The compressor to use for objects being stored.
 Default is zlib, implemented under `Dalli::Compressor`.

data/dalli.gemspec

@@ -22,7 +22,7 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
   s.summary = %q{High performance memcached client for Ruby}
   s.test_files = Dir.glob("test/**/*")
-  s.add_development_dependency(%q<mini_shoulda>, [">= 0"])
+  s.add_development_dependency(%q<minitest>, [">= 5.0.0"])
   s.add_development_dependency(%q<mocha>, [">= 0"])
   s.add_development_dependency(%q<rails>, ["~> 3"])
 end

data/lib/active_support/cache/dalli_store.rb

@@ -201,6 +201,10 @@ module ActiveSupport
         nil
       end
 
+      # Clear any local cache
+      def cleanup(options=nil)
+      end
+
       # Get the statistics from the memcached servers.
       def stats
         @data.stats
@@ -233,6 +237,8 @@ module ActiveSupport
 
       # Write an entry to the cache.
       def write_entry(key, value, options) # :nodoc:
+        # cleanup LocalCache
+        cleanup if options[:unless_exist]
         method = options[:unless_exist] ? :add : :set
         expires_in = options[:expires_in]
         @data.send(method, key, value, expires_in, options)

data/lib/dalli/client.rb

@@ -67,82 +67,98 @@ module Dalli
     # Fetch multiple keys efficiently.
     # Returns a hash of { 'key' => 'value', 'key2' => 'value1' }
     def get_multi(*keys)
-      return {} if keys.empty?
-      options = nil
-      options = keys.pop if keys.last.is_a?(Hash) || keys.last.nil?
-      ring.lock do
-        begin
-          servers = self.servers_in_use = Set.new
-
-          keys.flatten.each do |key|
-            begin
-              perform(:getkq, key)
-            rescue DalliError, NetworkError => e
-              Dalli.logger.debug { e.inspect }
-              Dalli.logger.debug { "unable to get key #{key}" }
+      perform do
+        return {} if keys.empty?
+        options = nil
+        options = keys.pop if keys.last.is_a?(Hash) || keys.last.nil?
+        ring.lock do
+          begin
+            mapped_keys = keys.flatten.map {|a| validate_key(a.to_s)}
+            groups = mapped_keys.flatten.group_by do |key|
+              begin
+                ring.server_for_key(key)
+              rescue Dalli::RingError
+                Dalli.logger.debug { "unable to get key #{key}" }
+                nil
+              end
+            end
+            if unfound_keys = groups.delete(nil)
+              Dalli.logger.debug { "unable to get keys for #{unfound_keys.length} keys because no matching server was found" }
             end
-          end
 
-          values = {}
-          return values if servers.empty?
-
-          servers.each do |server|
-            next unless server.alive?
-            begin
-              server.multi_response_start
-            rescue DalliError, NetworkError => e
-              Dalli.logger.debug { e.inspect }
-              Dalli.logger.debug { "results from this server will be missing" }
-              servers.delete(server)
+            groups.each do |server, keys_for_server|
+              begin
+                # TODO: do this with the perform chokepoint?
+                # But given the fact that fetching the response doesn't take place
+                # in that slot it's misleading anyway. Need to move all of this method
+                # into perform to be meaningful
+                server.request(:send_multiget, keys_for_server)
+              rescue DalliError, NetworkError => e
+                Dalli.logger.debug { e.inspect }
+                Dalli.logger.debug { "unable to get keys for server #{server.hostname}:#{server.port}" }
+              end
             end
-          end
 
-          start = Time.now
-          loop do
-            # remove any dead servers
-            servers.delete_if { |s| s.sock.nil? }
-            break if servers.empty?
-
-            # calculate remaining timeout
-            elapsed = Time.now - start
-            timeout = servers.first.options[:socket_timeout]
-            if elapsed > timeout
-              readable = nil
-            else
-              sockets = servers.map(&:sock)
-              readable, _ = IO.select(sockets, nil, nil, timeout - elapsed)
+            servers = groups.keys
+            values = {}
+            return values if servers.empty?
+
+            servers.each do |server|
+              next unless server.alive?
+              begin
+                server.multi_response_start
+              rescue DalliError, NetworkError => e
+                Dalli.logger.debug { e.inspect }
+                Dalli.logger.debug { "results from this server will be missing" }
+                servers.delete(server)
+              end
             end
 
-            if readable.nil?
-              # no response within timeout; abort pending connections
-              servers.each do |server|
-                puts "Abort!"
-                server.multi_response_abort
+            start = Time.now
+            loop do
+              # remove any dead servers
+              servers.delete_if { |s| s.sock.nil? }
+              break if servers.empty?
+
+              # calculate remaining timeout
+              elapsed = Time.now - start
+              timeout = servers.first.options[:socket_timeout]
+              if elapsed > timeout
+                readable = nil
+              else
+                sockets = servers.map(&:sock)
+                readable, _ = IO.select(sockets, nil, nil, timeout - elapsed)
               end
-              break
 
-            else
-              readable.each do |sock|
-                server = sock.server
+              if readable.nil?
+                # no response within timeout; abort pending connections
+                servers.each do |server|
+                  Dalli.logger.debug { "memcached at #{server.name} did not response within timeout" }
+                  server.multi_response_abort
+                end
+                break
 
-                begin
-                  server.multi_response_nonblock.each do |key, value|
-                    values[key_without_namespace(key)] = value
-                  end
+              else
+                readable.each do |sock|
+                  server = sock.server
 
-                  if server.multi_response_completed?
+                  begin
+                    server.multi_response_nonblock.each do |key, value|
+                      values[key_without_namespace(key)] = value
+                    end
+
+                    if server.multi_response_completed?
+                      servers.delete(server)
+                    end
+                  rescue NetworkError
                     servers.delete(server)
                   end
-                rescue NetworkError
-                  servers.delete(server)
                 end
               end
             end
-          end
 
-          values
-        ensure
-          self.servers_in_use = nil
+            values
+          end
         end
       end
     end
@@ -321,13 +337,15 @@ module Dalli
     end
 
     # Chokepoint method for instrumentation
-    def perform(op, key, *args)
+    def perform(*all_args, &blk)
+      return blk.call if blk
+      op, key, *args = *all_args
+
       key = key.to_s
       key = validate_key(key)
       begin
         server = ring.server_for_key(key)
         ret = server.request(op, key, *args)
-        servers_in_use << server if servers_in_use
         ret
       rescue NetworkError => e
         Dalli.logger.debug { e.inspect }
@@ -336,14 +354,6 @@ module Dalli
       end
     end
 
-    def servers_in_use
-      Thread.current[:"#{object_id}-servers"]
-    end
-
-    def servers_in_use=(value)
-      Thread.current[:"#{object_id}-servers"] = value
-    end
-
     def validate_key(key)
       raise ArgumentError, "key cannot be blank" if !key || key.length == 0
       key = key_with_namespace(key)

data/lib/dalli/server.rb

@@ -48,6 +48,10 @@ module Dalli
       @inprogress = nil
     end
 
+    def name
+      "#{@hostname}:#{@port}"
+    end
+
     # Chokepoint method for instrumentation
     def request(op, *args)
       verify_state
@@ -252,44 +256,42 @@ module Dalli
       generic_response(true)
     end
 
-    def getkq(key)
-      req = [REQUEST, OPCODES[:getkq], key.bytesize, 0, 0, 0, key.bytesize, 0, 0, key].pack(FORMAT[:getkq])
+    def send_multiget(keys)
+      req = ""
+      keys.each do |key|
+        req << [REQUEST, OPCODES[:getkq], key.bytesize, 0, 0, 0, key.bytesize, 0, 0, key].pack(FORMAT[:getkq])
+      end
+      # Could send noop here instead of in multi_response_start
       write(req)
     end
 
     def set(key, value, ttl, cas, options)
       (value, flags) = serialize(key, value, options)
 
-      if under_max_value_size?(key, value)
+      guard_max_value(key, value) do
         req = [REQUEST, OPCODES[multi? ? :setq : :set], key.bytesize, 8, 0, 0, value.bytesize + key.bytesize + 8, 0, cas, flags, ttl, key, value].pack(FORMAT[:set])
         write(req)
         generic_response unless multi?
-      else
-        false
       end
     end
 
     def add(key, value, ttl, options)
       (value, flags) = serialize(key, value, options)
 
-      if under_max_value_size?(key, value)
+      guard_max_value(key, value) do
         req = [REQUEST, OPCODES[multi? ? :addq : :add], key.bytesize, 8, 0, 0, value.bytesize + key.bytesize + 8, 0, 0, flags, ttl, key, value].pack(FORMAT[:add])
         write(req)
         generic_response unless multi?
-      else
-        false
       end
     end
 
     def replace(key, value, ttl, options)
       (value, flags) = serialize(key, value, options)
 
-      if under_max_value_size?(key, value)
+      guard_max_value(key, value) do
         req = [REQUEST, OPCODES[multi? ? :replaceq : :replace], key.bytesize, 8, 0, 0, value.bytesize + key.bytesize + 8, 0, 0, flags, ttl, key, value].pack(FORMAT[:replace])
         write(req)
         generic_response unless multi?
-      else
-        false
       end
     end
 
@@ -451,11 +453,11 @@ module Dalli
     NORMAL_HEADER = '@4CCnN'
     KV_HEADER = '@2n@6nN'
 
-    def under_max_value_size?(key, value)
+    def guard_max_value(key, value)
       if value.bytesize <= @options[:value_max_bytes]
-        true
+        yield
       else
-        Dalli.logger.warn "Value for #{key} over max size"
+        Dalli.logger.warn "Value for #{key} over max size: #{@options[:value_max_bytes]} <= #{value.bytesize}"
         false
       end
     end

data/lib/dalli/version.rb

@@ -1,3 +1,3 @@
 module Dalli
-  VERSION = '2.6.3'
+  VERSION = '2.6.4'
 end

data/test/helper.rb

@@ -5,7 +5,6 @@ require 'rubygems'
 require 'minitest/pride'
 require 'minitest/autorun'
 require 'mocha/setup'
-require 'mini_shoulda'
 require 'memcached_mock'
 
 WANT_RAILS_VERSION = ENV['RAILS_VERSION'] || '>= 3.0.0'

data/test/test_active_support.rb

@@ -8,14 +8,14 @@ class MockUser
 end
 
 describe 'ActiveSupport' do
-  context 'active_support caching' do
+  describe 'active_support caching' do
 
-    should 'have accessible options' do
+    it 'has accessible options' do
       @dalli = ActiveSupport::Cache.lookup_store(:dalli_store, 'localhost:19122', :expires_in => 5.minutes, :frob => 'baz')
       assert_equal 'baz', @dalli.options[:frob]
     end
 
-    should 'allow mute and silence' do
+    it 'allow mute and silence' do
       @dalli = ActiveSupport::Cache.lookup_store(:dalli_store, 'localhost:19122')
       @dalli.mute do
         assert_equal true, @dalli.write('foo', 'bar', nil)
@@ -26,7 +26,7 @@ describe 'ActiveSupport' do
       assert_equal true, @dalli.silence?
     end
 
-    should 'handle nil options' do
+    it 'handle nil options' do
       @dalli = ActiveSupport::Cache.lookup_store(:dalli_store, 'localhost:19122')
       assert_equal true, @dalli.write('foo', 'bar', nil)
       assert_equal 'bar', @dalli.read('foo', nil)
@@ -38,7 +38,7 @@ describe 'ActiveSupport' do
       assert_equal true, @dalli.delete('lkjsa')
     end
 
-    should 'support fetch' do
+    it 'support fetch' do
       with_activesupport do
         memcached do
           connect
@@ -65,7 +65,7 @@ describe 'ActiveSupport' do
       end
     end
 
-    should 'support keys with spaces on Rails3' do
+    it 'support keys with spaces on Rails3' do
       with_activesupport do
         memcached do
           connect
@@ -75,7 +75,7 @@ describe 'ActiveSupport' do
       end
     end
 
-    should 'support read_multi' do
+    it 'support read_multi' do
       with_activesupport do
         memcached do
           connect
@@ -89,7 +89,7 @@ describe 'ActiveSupport' do
       end
     end
 
-    should 'support read_multi with an array' do
+    it 'support read_multi with an array' do
       with_activesupport do
         memcached do
           connect
@@ -105,7 +105,7 @@ describe 'ActiveSupport' do
       end
     end
 
-    should 'support raw read_multi' do
+    it 'support raw read_multi' do
       with_activesupport do
         memcached do
           connect
@@ -116,7 +116,7 @@ describe 'ActiveSupport' do
       end
     end
 
-    should 'support read_multi with LocalCache' do
+    it 'support read_multi with LocalCache' do
       with_activesupport do
         memcached do
           connect
@@ -147,7 +147,7 @@ describe 'ActiveSupport' do
       end
     end
 
-    should 'support read, write and delete' do
+    it 'support read, write and delete' do
       with_activesupport do
         memcached do
           connect
@@ -180,7 +180,7 @@ describe 'ActiveSupport' do
       end
     end
 
-    should 'support read, write and delete with LocalCache' do
+    it 'support read, write and delete with LocalCache' do
       with_activesupport do
         memcached do
           connect
@@ -208,7 +208,31 @@ describe 'ActiveSupport' do
       end
     end
 
-    should 'support increment/decrement commands' do
+    it 'support unless_exist with LocalCache' do
+      with_activesupport do
+        memcached do
+          connect
+          y = rand_key.to_s
+          @dalli.with_local_cache do
+            Dalli::Client.any_instance.expects(:add).with(y, 123, nil, {:unless_exist => true}).once.returns(true)
+            dres = @dalli.write(y, 123, :unless_exist => true)
+            assert_equal true, dres
+
+            Dalli::Client.any_instance.expects(:add).with(y, 321, nil, {:unless_exist => true}).once.returns(false)
+
+            dres = @dalli.write(y, 321, :unless_exist => true)
+            assert_equal false, dres
+
+            Dalli::Client.any_instance.expects(:get).with(y, {}).once.returns(123)
+
+            dres = @dalli.read(y)
+            assert_equal 123, dres
+          end
+        end
+      end
+    end
+
+    it 'support increment/decrement commands' do
       with_activesupport do
         memcached do
           connect
@@ -246,7 +270,7 @@ describe 'ActiveSupport' do
       end
     end
 
-    should 'support exist command' do
+    it 'support exist command' do
       with_activesupport do
         memcached do
           connect
@@ -265,7 +289,7 @@ describe 'ActiveSupport' do
       end
     end
 
-    should 'support other esoteric commands' do
+    it 'support other esoteric commands' do
       with_activesupport do
         memcached do
           connect
@@ -278,7 +302,7 @@ describe 'ActiveSupport' do
       end
     end
 
-    should 'respect "raise_errors" option' do
+    it 'respect "raise_errors" option' do
       with_activesupport do
         memcached(29125) do
           @dalli = ActiveSupport::Cache.lookup_store(:dalli_store, 'localhost:29125')
@@ -308,7 +332,7 @@ describe 'ActiveSupport' do
     end
   end
 
-  should 'handle crazy characters from far-away lands' do
+  it 'handle crazy characters from far-away lands' do
     with_activesupport do
       memcached do
         connect
@@ -320,7 +344,7 @@ describe 'ActiveSupport' do
     end
   end
 
-  should 'normalize options as expected' do
+  it 'normalize options as expected' do
     with_activesupport do
       memcached do
         @dalli = ActiveSupport::Cache::DalliStore.new('localhost:19122', :expires_in => 1, :namespace => 'foo', :compress => true)
@@ -330,7 +354,7 @@ describe 'ActiveSupport' do
     end
   end
 
-  should 'allow keys to be frozen' do
+  it 'allow keys to be frozen' do
     with_activesupport do
       memcached do
         connect
@@ -341,7 +365,7 @@ describe 'ActiveSupport' do
     end
   end
 
-  should 'allow keys from a hash' do
+  it 'allow keys from a hash' do
     with_activesupport do
       memcached do
         connect

data/test/test_compressor.rb

@@ -15,7 +15,7 @@ end
 
 describe 'Compressor' do
 
-  should 'default to Dalli::Compressor' do
+  it 'default to Dalli::Compressor' do
     memcached_kill(29199) do |dc|
       memcache = Dalli::Client.new('127.0.0.1:29199')
       memcache.set 1,2
@@ -23,16 +23,16 @@ describe 'Compressor' do
     end
   end
 
-  should 'support a custom compressor' do
+  it 'support a custom compressor' do
     memcached_kill(29199) do |dc|
       memcache = Dalli::Client.new('127.0.0.1:29199', :compressor => NoopCompressor)
       memcache.set 1,2
       begin
         assert_equal NoopCompressor, memcache.instance_variable_get('@ring').servers.first.compressor
 
-        memcached(19127) do |dc|
-          assert dc.set("string-test", "a test string")
-          assert_equal("a test string", dc.get("string-test"))
+        memcached(19127) do |newdc|
+          assert newdc.set("string-test", "a test string")
+          assert_equal("a test string", newdc.get("string-test"))
         end
       end
     end
@@ -41,7 +41,7 @@ end
 
 describe 'GzipCompressor' do
 
-  should 'compress and uncompress data using Zlib::GzipWriter/Reader' do
+  it 'compress and uncompress data using Zlib::GzipWriter/Reader' do
     memcached(19127,nil,{:compress=>true,:compressor=>Dalli::GzipCompressor}) do |dc|
       data = (0...1025).map{65.+(rand(26)).chr}.join
       assert dc.set("test", data)

data/test/test_dalli.rb

@@ -3,19 +3,19 @@ require 'memcached_mock'
 
 describe 'Dalli' do
   describe 'options parsing' do
-    should 'handle deprecated options' do
+    it 'handle deprecated options' do
       dc = Dalli::Client.new('foo', :compression => true)
       assert dc.instance_variable_get(:@options)[:compress]
       refute dc.instance_variable_get(:@options)[:compression]
     end
 
-    should 'not warn about valid options' do
+    it 'not warn about valid options' do
       dc = Dalli::Client.new('foo', :compress => true)
       # Rails.logger.expects :warn
       assert dc.instance_variable_get(:@options)[:compress]
     end
 
-    should 'raises error with invalid expires_in' do
+    it 'raises error with invalid expires_in' do
       bad_data = [{:bad => 'expires in data'}, Hash, [1,2,3]]
       bad_data.each do |bad|
         assert_raises ArgumentError do
@@ -26,7 +26,7 @@ describe 'Dalli' do
   end
 
   describe 'key validation' do
-    should 'not allow blanks' do
+    it 'not allow blanks' do
       memcached do |dc|
         dc.set '   ', 1
         assert_equal 1, dc.get('   ')
@@ -44,7 +44,7 @@ describe 'Dalli' do
     end
   end
 
-  should "default to localhost:11211" do
+  it "default to localhost:11211" do
     dc = Dalli::Client.new
     ring = dc.send(:ring)
     s1 = ring.servers.first.hostname
@@ -67,7 +67,7 @@ describe 'Dalli' do
     assert_equal s2, s3
   end
 
-  should "accept comma separated string" do
+  it "accept comma separated string" do
     dc = Dalli::Client.new("server1.example.com:11211,server2.example.com:11211")
     ring = dc.send(:ring)
     assert_equal 2, ring.servers.size
@@ -76,7 +76,7 @@ describe 'Dalli' do
     assert_equal "server2.example.com", s2
   end
 
-  should "accept array of servers" do
+  it "accept array of servers" do
     dc = Dalli::Client.new(["server1.example.com:11211","server2.example.com:11211"])
     ring = dc.send(:ring)
     assert_equal 2, ring.servers.size
@@ -85,9 +85,9 @@ describe 'Dalli' do
     assert_equal "server2.example.com", s2
   end
 
-  context 'using a live server' do
+  describe 'using a live server' do
 
-    should "support get/set" do
+    it "support get/set" do
       memcached do |dc|
         dc.flush
 
@@ -104,7 +104,7 @@ describe 'Dalli' do
       end
     end
 
-    should "support stats" do
+    it "support stats" do
       memcached do |dc|
         # make sure that get_hits would not equal 0
         dc.get(:a)
@@ -144,7 +144,7 @@ describe 'Dalli' do
       end
     end
 
-    should "support the fetch operation" do
+    it "support the fetch operation" do
       memcached do |dc|
         dc.flush
 
@@ -167,7 +167,7 @@ describe 'Dalli' do
       end
     end
 
-    should "support the fetch operation with falsey values" do
+    it "support the fetch operation with falsey values" do
       memcached do |dc|
         dc.flush
 
@@ -181,14 +181,14 @@ describe 'Dalli' do
       end
     end
 
-    should "support the cas operation" do
+    it "support the cas operation" do
       memcached do |dc|
         dc.flush
 
         expected = { 'blah' => 'blerg!' }
 
         resp = dc.cas('cas_key') do |value|
-          fail('Value should not exist')
+          fail('Value it not exist')
         end
         assert_nil resp
 
@@ -205,7 +205,7 @@ describe 'Dalli' do
       end
     end
 
-    should "support multi-get" do
+    it "support multi-get" do
       memcached do |dc|
         dc.close
         dc.flush
@@ -233,7 +233,7 @@ describe 'Dalli' do
       end
     end
 
-    should 'support raw incr/decr' do
+    it 'support raw incr/decr' do
       memcached do |client|
         client.flush
 
@@ -263,7 +263,7 @@ describe 'Dalli' do
       end
     end
 
-    should "support incr/decr operations" do
+    it "support incr/decr operations" do
       memcached do |dc|
         dc.flush
 
@@ -311,7 +311,7 @@ describe 'Dalli' do
       end
     end
 
-    should 'support the append and prepend operations' do
+    it 'support the append and prepend operations' do
       memcached do |dc|
         dc.flush
         assert_equal true, dc.set('456', 'xyz', 0, :raw => true)
@@ -325,7 +325,7 @@ describe 'Dalli' do
       end
     end
 
-    should 'support touch operation' do
+    it 'support touch operation' do
       memcached do |dc|
         begin
           dc.flush
@@ -341,7 +341,7 @@ describe 'Dalli' do
       end
     end
 
-    should 'allow TCP connections to be configured for keepalive' do
+    it 'allow TCP connections to be configured for keepalive' do
       memcached(19122, '', :keepalive => true) do |dc|
         dc.set(:a, 1)
         ring = dc.send(:ring)
@@ -355,7 +355,7 @@ describe 'Dalli' do
       end
     end
 
-    should "pass a simple smoke test" do
+    it "pass a simple smoke test" do
       memcached do |dc|
         resp = dc.flush
         refute_nil resp
@@ -413,7 +413,7 @@ describe 'Dalli' do
       end
     end
 
-    should "support multithreaded access" do
+    it "support multithreaded access" do
       memcached do |cache|
         cache.flush
         workers = []
@@ -456,7 +456,7 @@ describe 'Dalli' do
       end
     end
 
-    should "handle namespaced keys" do
+    it "handle namespaced keys" do
       memcached do |dc|
         dc = Dalli::Client.new('localhost:19122', :namespace => 'a')
         dc.set('namespaced', 1)
@@ -467,7 +467,7 @@ describe 'Dalli' do
       end
     end
 
-    should 'truncate cache keys that are too long' do
+    it 'truncate cache keys that are too long' do
       memcached do
         @dalli = Dalli::Client.new('localhost:19122', :namespace => 'some:namspace')
         key = "this cache key is far too long so it must be hashed and truncated and stuff" * 10
@@ -477,7 +477,7 @@ describe 'Dalli' do
       end
     end
 
-    should "handle namespaced keys in multi_get" do
+    it "handle namespaced keys in multi_get" do
       memcached do |dc|
         dc = Dalli::Client.new('localhost:19122', :namespace => 'a')
         dc.set('a', 1)
@@ -486,7 +486,7 @@ describe 'Dalli' do
       end
     end
 
-    should "handle application marshalling issues" do
+    it "handle application marshalling issues" do
       memcached do |dc|
         old = Dalli.logger
         Dalli.logger = Logger.new(nil)
@@ -498,8 +498,8 @@ describe 'Dalli' do
       end
     end
 
-    context 'with compression' do
-      should 'allow large values' do
+    describe 'with compression' do
+      it 'allow large values' do
         memcached do |dc|
           dalli = Dalli::Client.new(dc.instance_variable_get(:@servers), :compress => true)
 
@@ -510,9 +510,9 @@ describe 'Dalli' do
       end
     end
 
-    context 'in low memory conditions' do
+    describe 'in low memory conditions' do
 
-      should 'handle error response correctly' do
+      it 'handle error response correctly' do
         memcached(19125, '-m 1 -M') do |dc|
           failed = false
           value = "1234567890"*100
@@ -529,7 +529,7 @@ describe 'Dalli' do
         end
       end
 
-      should 'fit more values with compression' do
+      it 'fit more values with compression' do
         memcached(19126, '-m 1 -M') do |dc|
           dalli = Dalli::Client.new('localhost:19126', :compress => true)
           failed = false

data/test/test_encoding.rb

@@ -4,8 +4,8 @@ require 'memcached_mock'
 
 describe 'Encoding' do
 
-  context 'using a live server' do
-    should 'support i18n content' do
+  describe 'using a live server' do
+    it 'support i18n content' do
       memcached do |dc|
         key = 'foo'
         utf_key = utf8 = 'ƒ©åÍÎ'
@@ -18,7 +18,7 @@ describe 'Encoding' do
       end
     end
 
-    should 'support content expiry' do
+    it 'support content expiry' do
       memcached do |dc|
         key = 'foo'
         assert dc.set(key, 'bar', 1)

data/test/test_failover.rb

@@ -3,7 +3,7 @@ require 'helper'
 describe 'failover' do
 
   describe 'timeouts' do
-    should 'not lead to corrupt sockets' do
+    it 'not lead to corrupt sockets' do
       memcached(29125) do
         dc = Dalli::Client.new ['localhost:29125']
         begin
@@ -22,9 +22,9 @@ describe 'failover' do
   end
 
 
-  context 'assuming some bad servers' do
+  describe 'assuming some bad servers' do
 
-    should 'silently reconnect if server hiccups' do
+    it 'silently reconnect if server hiccups' do
       memcached(29125) do
         dc = Dalli::Client.new ['localhost:29125']
         dc.set 'foo', 'bar'
@@ -42,7 +42,7 @@ describe 'failover' do
       end
     end
 
-    should 'handle graceful failover' do
+    it 'handle graceful failover' do
       memcached(29125) do
         memcached(29126) do
           dc = Dalli::Client.new ['localhost:29125', 'localhost:29126']
@@ -65,7 +65,7 @@ describe 'failover' do
       end
     end
 
-    should 'handle them gracefully in get_multi' do
+    it 'handle them gracefully in get_multi' do
       memcached(29125) do
         memcached(29126) do
           dc = Dalli::Client.new ['localhost:29125', 'localhost:29126']
@@ -81,7 +81,7 @@ describe 'failover' do
       end
     end
 
-    should 'handle graceful failover in get_multi' do
+    it 'handle graceful failover in get_multi' do
       memcached(29125) do
         memcached(29126) do
           dc = Dalli::Client.new ['localhost:29125', 'localhost:29126']
@@ -105,7 +105,7 @@ describe 'failover' do
       end
     end
 
-    should 'stats should still properly report' do
+    it 'stats it still properly report' do
       memcached(29125) do
         memcached(29126) do
           dc = Dalli::Client.new ['localhost:29125', 'localhost:29126']

data/test/test_network.rb

@@ -2,17 +2,17 @@ require 'helper'
 
 describe 'Network' do
 
-  context 'assuming a bad network' do
+  describe 'assuming a bad network' do
 
-    should 'handle no server available' do
+    it 'handle no server available' do
       assert_raises Dalli::RingError, :message => "No server available" do
         dc = Dalli::Client.new 'localhost:19333'
         dc.get 'foo'
       end
     end
 
-    context 'with a fake server' do
-      should 'handle connection reset' do
+    describe 'with a fake server' do
+      it 'handle connection reset' do
         memcached_mock(lambda {|sock| sock.close }) do
           assert_raises Dalli::RingError, :message => "No server available" do
             dc = Dalli::Client.new('localhost:19123')
@@ -21,7 +21,7 @@ describe 'Network' do
         end
       end
 
-      should 'handle malformed response' do
+      it 'handle malformed response' do
         memcached_mock(lambda {|sock| sock.write('123') }) do
           assert_raises Dalli::RingError, :message => "No server available" do
             dc = Dalli::Client.new('localhost:19123')
@@ -30,7 +30,7 @@ describe 'Network' do
         end
       end
 
-      should 'handle connect timeouts' do
+      it 'handle connect timeouts' do
         memcached_mock(lambda {|sock| sleep(0.6); sock.close }, :delayed_start) do
           assert_raises Dalli::RingError, :message => "No server available" do
             dc = Dalli::Client.new('localhost:19123')
@@ -39,7 +39,7 @@ describe 'Network' do
         end
       end
 
-      should 'handle read timeouts' do
+      it 'handle read timeouts' do
         memcached_mock(lambda {|sock| sleep(0.6); sock.write('giraffe') }) do
           assert_raises Dalli::RingError, :message => "No server available" do
             dc = Dalli::Client.new('localhost:19123')

data/test/test_ring.rb

@@ -2,9 +2,9 @@ require 'helper'
 
 describe 'Ring' do
 
-  context 'a ring of servers' do
+  describe 'a ring of servers' do
 
-    should "have the continuum sorted by value" do
+    it "have the continuum sorted by value" do
       servers = [stub(:hostname => "localhost", :port => "11211", :weight => 1),
                  stub(:hostname => "localhost", :port => "9500", :weight => 1)]
       ring = Dalli::Ring.new(servers, {})
@@ -15,15 +15,15 @@ describe 'Ring' do
       end
     end
 
-    should 'raise when no servers are available/defined' do
+    it 'raise when no servers are available/defined' do
       ring = Dalli::Ring.new([], {})
       assert_raises Dalli::RingError, :message => "No server available" do
         ring.server_for_key('test')
       end
     end
 
-    context 'containing only a single server' do
-      should "raise correctly when it's not alive" do
+    describe 'containing only a single server' do
+      it "raise correctly when it's not alive" do
         servers = [
           Dalli::Server.new("localhost:12345"),
         ]
@@ -33,7 +33,7 @@ describe 'Ring' do
         end
       end
 
-      should "return the server when it's alive" do
+      it "return the server when it's alive" do
         servers = [
           Dalli::Server.new("localhost:19191"),
         ]
@@ -45,8 +45,8 @@ describe 'Ring' do
       end
     end
 
-    context 'containing multiple servers' do
-      should "raise correctly when no server is alive" do
+    describe 'containing multiple servers' do
+      it "raise correctly when no server is alive" do
         servers = [
           Dalli::Server.new("localhost:12345"),
           Dalli::Server.new("localhost:12346"),
@@ -57,7 +57,7 @@ describe 'Ring' do
         end
       end
 
-      should "return an alive server when at least one is alive" do
+      it "return an alive server when at least one is alive" do
         servers = [
           Dalli::Server.new("localhost:12346"),
           Dalli::Server.new("localhost:19191"),
@@ -70,7 +70,7 @@ describe 'Ring' do
       end
     end
 
-    should 'detect when a dead server is up again' do
+    it 'detect when a dead server is up again' do
       memcached(19997) do
         down_retry_delay = 0.5
         dc = Dalli::Client.new(['localhost:19997', 'localhost:19998'], :down_retry_delay => down_retry_delay)

data/test/test_sasl.rb

@@ -2,7 +2,11 @@ require 'helper'
 
 describe 'Sasl' do
 
-  context 'a server requiring authentication' do
+  # https://github.com/seattlerb/minitest/issues/298
+  def self.xit(msg, &block)
+  end
+
+  describe 'a server requiring authentication' do
     before do
       @server = mock()
       @server.stubs(:request).returns(true)
@@ -11,7 +15,7 @@ describe 'Sasl' do
       @server.stubs(:port).returns("19124")
     end
 
-    context 'without authentication credentials' do
+    describe 'without authentication credentials' do
       before do
         ENV['MEMCACHE_USERNAME'] = 'foo'
         ENV['MEMCACHE_PASSWORD'] = 'wrongpwd'
@@ -22,11 +26,11 @@ describe 'Sasl' do
         ENV['MEMCACHE_PASSWORD'] = nil
       end
 
-      should 'provide one test that passes' do
+      it 'provide one test that passes' do
         assert true
       end
 
-      should_eventually 'gracefully handle authentication failures' do
+      xit 'gracefully handle authentication failures' do
         memcached(19124, '-S') do |dc|
           assert_raise Dalli::DalliError, /32/ do
             dc.set('abc', 123)
@@ -35,7 +39,7 @@ describe 'Sasl' do
       end
     end
 
-    should_eventually 'fail SASL authentication with wrong options' do
+    xit 'fail SASL authentication with wrong options' do
       memcached(19124, '-S') do |dc|
         dc = Dalli::Client.new('localhost:19124', :username => 'foo', :password => 'wrongpwd')
         assert_raise Dalli::DalliError, /32/ do
@@ -49,7 +53,7 @@ describe 'Sasl' do
     # saslpasswd2 -a memcached -c testuser
     #
     # with password 'testtest'
-    context 'in an authenticated environment' do
+    describe 'in an authenticated environment' do
       before do
         ENV['MEMCACHE_USERNAME'] = 'testuser'
         ENV['MEMCACHE_PASSWORD'] = 'testtest'
@@ -60,7 +64,7 @@ describe 'Sasl' do
         ENV['MEMCACHE_PASSWORD'] = nil
       end
 
-      should_eventually 'pass SASL authentication' do
+      xit 'pass SASL authentication' do
         memcached(19124, '-S') do |dc|
           # I get "Dalli::DalliError: Error authenticating: 32" in OSX
           # but SASL works on Heroku servers. YMMV.
@@ -73,7 +77,7 @@ describe 'Sasl' do
       end
     end
 
-    should_eventually 'pass SASL authentication with options' do
+    xit 'pass SASL authentication with options' do
       memcached(19124, '-S') do |dc|
         dc = Dalli::Client.new('localhost:19124', :username => 'testuser', :password => 'testtest')
         # I get "Dalli::DalliError: Error authenticating: 32" in OSX
@@ -86,14 +90,14 @@ describe 'Sasl' do
       end
     end
 
-    should 'pass SASL as URI' do
+    it 'pass SASL as URI' do
       Dalli::Server.expects(:new).with("localhost:19124",
         :username => "testuser", :password => "testtest").returns(@server)
       dc = Dalli::Client.new('memcached://testuser:testtest@localhost:19124')
       dc.flush_all
     end
 
-    should 'pass SASL as ring of URIs' do
+    it 'pass SASL as ring of URIs' do
       Dalli::Server.expects(:new).with("localhost:19124",
         :username => "testuser", :password => "testtest").returns(@server)
       Dalli::Server.expects(:new).with("otherhost:19125",

data/test/test_serializer.rb

@@ -5,7 +5,7 @@ require 'memcached_mock'
 
 describe 'Serializer' do
 
-  should 'default to Marshal' do
+  it 'default to Marshal' do
     memcached_kill(29198) do |dc|
       memcache = Dalli::Client.new('127.0.0.1:29198')
       memcache.set 1,2
@@ -13,16 +13,16 @@ describe 'Serializer' do
     end
   end
 
-  should 'support a custom serializer' do
+  it 'support a custom serializer' do
     memcached_kill(29198) do |dc|
       memcache = Dalli::Client.new('127.0.0.1:29198', :serializer => JSON)
       memcache.set 1,2
       begin
         assert_equal JSON, memcache.instance_variable_get('@ring').servers.first.serializer
 
-        memcached(19128) do |dc|
-          assert dc.set("json_test", {"foo" => "bar"})
-          assert_equal({"foo" => "bar"}, dc.get("json_test"))
+        memcached(19128) do |newdc|
+          assert newdc.set("json_test", {"foo" => "bar"})
+          assert_equal({"foo" => "bar"}, newdc.get("json_test"))
         end
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dalli
 version: !ruby/object:Gem::Version
-  version: 2.6.3
+  version: 2.6.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,16 +9,16 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-07 00:00:00.000000000 Z
+date: 2013-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: mini_shoulda
+  name: minitest
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 5.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 5.0.0
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement