dalli 2.6.4 → 2.7.0

data/test/test_dalli.rb

@@ -99,11 +99,34 @@ describe 'Dalli' do
         val2 = dc.get('a')
         assert_equal val1, val2
 
-        assert_equal true, dc.set('a', nil)
+        assert op_addset_succeeds(dc.set('a', nil))
         assert_nil dc.get('a')
       end
     end
 
+    it 'supports delete' do
+      memcached do |dc|
+        dc.set('some_key', 'some_value')
+        assert_equal 'some_value', dc.get('some_key')
+
+        dc.delete('some_key')
+        assert_nil dc.get('some_key')
+      end
+    end
+
+    it 'returns nil for nonexist key' do
+      memcached do |dc|
+        assert_equal nil, dc.get('notexist')
+      end
+    end
+
+    it 'allows "Not found" as value' do
+      memcached do |dc|
+        dc.set('key1', 'Not found')
+        assert_equal 'Not found', dc.get('key1')
+      end
+    end
+
     it "support stats" do
       memcached do |dc|
         # make sure that get_hits would not equal 0
@@ -198,7 +221,7 @@ describe 'Dalli' do
           assert_equal expected, value
           mutated
         end
-        assert_equal true, resp
+        assert op_cas_succeeds(resp)
 
         resp = dc.get('cas_key')
         assert_equal mutated, resp
@@ -215,8 +238,17 @@ describe 'Dalli' do
         dc.set('a', 'foo')
         dc.set('b', 123)
         dc.set('c', %w(a b c))
+        # Invocation without block
         resp = dc.get_multi(%w(a b c d e f))
-        assert_equal({ 'a' => 'foo', 'b' => 123, 'c' => %w(a b c) }, resp)
+        expected_resp = { 'a' => 'foo', 'b' => 123, 'c' => %w(a b c) }
+        assert_equal(expected_resp, resp)
+
+        # Invocation with block
+        dc.get_multi(%w(a b c d e f)) do |k, v|
+          assert(expected_resp.has_key?(k) && expected_resp[k] == v)
+          expected_resp.delete(k)
+        end
+        assert expected_resp.empty?
 
         # Perform a big multi-get with 1000 elements.
         arr = []
@@ -237,7 +269,7 @@ describe 'Dalli' do
       memcached do |client|
         client.flush
 
-        assert_equal true, client.set('fakecounter', 0, 0, :raw => true)
+        assert op_addset_succeeds(client.set('fakecounter', 0, 0, :raw => true))
         assert_equal 1, client.incr('fakecounter', 1)
         assert_equal 2, client.incr('fakecounter', 1)
         assert_equal 3, client.incr('fakecounter', 1)
@@ -253,7 +285,7 @@ describe 'Dalli' do
         assert_equal 3, resp
 
         resp = client.set('rawcounter', 10, 0, :raw => true)
-        assert_equal true, resp
+        assert op_cas_succeeds(resp)
 
         resp = client.get('rawcounter', :raw => true)
         assert_equal '10', resp
@@ -314,7 +346,7 @@ describe 'Dalli' do
     it 'support the append and prepend operations' do
       memcached do |dc|
         dc.flush
-        assert_equal true, dc.set('456', 'xyz', 0, :raw => true)
+        assert op_addset_succeeds(dc.set('456', 'xyz', 0, :raw => true))
         assert_equal true, dc.prepend('456', '0')
         assert_equal true, dc.append('456', '9')
         assert_equal '0xyz9', dc.get('456', :raw => true)
@@ -325,6 +357,16 @@ describe 'Dalli' do
       end
     end
 
+    it 'supports replace operation' do
+      memcached do |dc|
+        dc.flush
+        dc.set('key', 'value')
+        assert op_replace_succeeds(dc.replace('key', 'value2'))
+
+        assert_equal 'value2', dc.get('key')
+      end
+    end
+
     it 'support touch operation' do
       memcached do |dc|
         begin
@@ -341,6 +383,16 @@ describe 'Dalli' do
       end
     end
 
+    it 'support version operation' do
+      memcached do |dc|
+        v = dc.version
+        servers = v.keys
+        assert(servers.any? do |s|
+          v[s] != nil
+        end, "version failed")
+      end
+    end
+
     it 'allow TCP connections to be configured for keepalive' do
       memcached(19122, '', :keepalive => true) do |dc|
         dc.set(:a, 1)
@@ -361,20 +413,18 @@ describe 'Dalli' do
         refute_nil resp
         assert_equal [true, true], resp
 
-        assert_equal true, dc.set(:foo, 'bar')
+        assert op_addset_succeeds(dc.set(:foo, 'bar'))
         assert_equal 'bar', dc.get(:foo)
 
         resp = dc.get('123')
         assert_equal nil, resp
 
-        resp = dc.set('123', 'xyz')
-        assert_equal true, resp
+        assert op_addset_succeeds(dc.set('123', 'xyz'))
 
         resp = dc.get('123')
         assert_equal 'xyz', resp
 
-        resp = dc.set('123', 'abc')
-        assert_equal true, resp
+        assert op_addset_succeeds(dc.set('123', 'abc'))
 
         dc.prepend('123', '0')
         dc.append('123', '0')
@@ -388,8 +438,7 @@ describe 'Dalli' do
 
         dc = Dalli::Client.new('localhost:19122')
 
-        resp = dc.set('456', 'xyz', 0, :raw => true)
-        assert_equal true, resp
+        assert op_addset_succeeds(dc.set('456', 'xyz', 0, :raw => true))
 
         resp = dc.prepend '456', '0'
         assert_equal true, resp
@@ -400,8 +449,7 @@ describe 'Dalli' do
         resp = dc.get('456', :raw => true)
         assert_equal '0xyz9', resp
 
-        resp = dc.set('456', false)
-        assert_equal true, resp
+        assert op_addset_succeeds(dc.set('456', false))
 
         resp = dc.get('456')
         assert_equal false, resp
@@ -419,9 +467,9 @@ describe 'Dalli' do
         workers = []
 
         cache.set('f', 'zzz')
-        assert_equal true, (cache.cas('f') do |value|
+        assert op_cas_succeeds((cache.cas('f') do |value|
           value << 'z'
-        end)
+        end))
         assert_equal 'zzzz', cache.get('f')
 
         # Have a bunch of threads perform a bunch of operations at the same time.
@@ -469,11 +517,11 @@ describe 'Dalli' do
 
     it 'truncate cache keys that are too long' do
       memcached do
-        @dalli = Dalli::Client.new('localhost:19122', :namespace => 'some:namspace')
+        dc = 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
         value = "some value"
-        assert_equal true, @dalli.set(key, value)
-        assert_equal value, @dalli.get(key)
+        assert op_addset_succeeds(dc.set(key, value))
+        assert_equal value, dc.get(key)
       end
     end
 
@@ -518,7 +566,7 @@ describe 'Dalli' do
           value = "1234567890"*100
           1_000.times do |idx|
             begin
-              assert_equal true, dc.set(idx, value)
+              assert op_addset_succeeds(dc.set(idx, value))
             rescue Dalli::DalliError
               failed = true
               assert((800..960).include?(idx), "unexpected failure on iteration #{idx}")
@@ -536,7 +584,7 @@ describe 'Dalli' do
           value = "1234567890"*1000
           10_000.times do |idx|
             begin
-              assert_equal true, dalli.set(idx, value)
+              assert op_addset_succeeds(dalli.set(idx, value))
             rescue Dalli::DalliError
               failed = true
               assert((6000..7800).include?(idx), "unexpected failure on iteration #{idx}")

data/test/test_sasl.rb

@@ -30,19 +30,19 @@ describe 'Sasl' do
         assert true
       end
 
-      xit 'gracefully handle authentication failures' do
+      it 'gracefully handle authentication failures' do
         memcached(19124, '-S') do |dc|
-          assert_raise Dalli::DalliError, /32/ do
+          assert_error Dalli::DalliError, /32/ do
             dc.set('abc', 123)
           end
         end
       end
     end
 
-    xit 'fail SASL authentication with wrong options' do
+    it '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
+        assert_error Dalli::DalliError, /32/ do
           dc.set('abc', 123)
         end
       end

metadata

@@ -1,52 +1,46 @@
 --- !ruby/object:Gem::Specification
 name: dalli
 version: !ruby/object:Gem::Version
-  version: 2.6.4
-  prerelease: 
+  version: 2.7.0
 platform: ruby
 authors:
 - Mike Perham
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-27 00:00:00.000000000 Z
+date: 2014-01-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 5.0.0
+        version: 4.2.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 5.0.0
+        version: 4.2.0
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -54,7 +48,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -67,6 +60,7 @@ extra_rdoc_files: []
 files:
 - lib/action_dispatch/middleware/session/dalli_store.rb
 - lib/active_support/cache/dalli_store.rb
+- lib/dalli/cas/client.rb
 - lib/dalli/client.rb
 - lib/dalli/compressor.rb
 - lib/dalli/options.rb
@@ -87,7 +81,9 @@ files:
 - test/benchmark_test.rb
 - test/helper.rb
 - test/memcached_mock.rb
+- test/sasldb
 - test/test_active_support.rb
+- test/test_cas_client.rb
 - test/test_compressor.rb
 - test/test_dalli.rb
 - test/test_encoding.rb
@@ -100,34 +96,35 @@ files:
 homepage: http://github.com/mperham/dalli
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options:
 - --charset=UTF-8
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.0.14
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: High performance memcached client for Ruby
 test_files:
 - test/benchmark_test.rb
 - test/helper.rb
 - test/memcached_mock.rb
+- test/sasldb
 - test/test_active_support.rb
+- test/test_cas_client.rb
 - test/test_compressor.rb
 - test/test_dalli.rb
 - test/test_encoding.rb