dalli 2.7.2 → 2.7.3

data/test/test_network.rb

@@ -21,6 +21,16 @@ describe 'Network' do
         end
       end
 
+      it 'handle connection reset with unix socket' do
+        socket_path = MemcachedMock::UNIX_SOCKET_PATH
+        memcached_mock(lambda {|sock| sock.close }, :start_unix, socket_path) do
+          assert_raises Dalli::RingError, :message => "No server available" do
+            dc = Dalli::Client.new(socket_path)
+            dc.get('abc')
+          end
+        end
+      end
+
       it 'handle malformed response' do
         memcached_mock(lambda {|sock| sock.write('123') }) do
           assert_raises Dalli::RingError, :message => "No server available" do

data/test/test_rack_session.rb

@@ -6,11 +6,11 @@ require 'rack/mock'
 require 'thread'
 
 describe Rack::Session::Dalli do
-  Rack::Session::Dalli::DEFAULT_OPTIONS[:memcache_server] = 'localhost:19129'
 
   before do
-    memcached(19129) do
-    end
+    @port = 19129
+    memcached_persistent(@port)
+    Rack::Session::Dalli::DEFAULT_OPTIONS[:memcache_server] = "localhost:#{@port}"
 
     # test memcache connection
     Rack::Session::Dalli.new(incrementor)

data/test/test_ring.rb

@@ -5,8 +5,8 @@ describe 'Ring' do
   describe 'a ring of servers' do
 
     it "have the continuum sorted by value" do
-      servers = [stub(:hostname => "localhost", :port => "11211", :weight => 1),
-                 stub(:hostname => "localhost", :port => "9500", :weight => 1)]
+      servers = [stub(:name => "localhost:11211", :weight => 1),
+                 stub(:name => "localhost:9500", :weight => 1)]
       ring = Dalli::Ring.new(servers, {})
       previous_value = 0
       ring.continuum.each do |entry|

data/test/test_sasl.rb

@@ -11,8 +11,7 @@ describe 'Sasl' do
       @server = mock()
       @server.stubs(:request).returns(true)
       @server.stubs(:weight).returns(1)
-      @server.stubs(:hostname).returns("localhost")
-      @server.stubs(:port).returns("19124")
+      @server.stubs(:name).returns("localhost:19124")
     end
 
     describe 'without authentication credentials' do
@@ -26,12 +25,8 @@ describe 'Sasl' do
         ENV['MEMCACHE_PASSWORD'] = nil
       end
 
-      it 'provide one test that passes' do
-        assert true
-      end
-
-      it 'gracefully handle authentication failures' do
-        memcached(19124, '-S') do |dc|
+      xit 'gracefully handle authentication failures' do
+        memcached_sasl_persistent do |dc|
           assert_error Dalli::DalliError, /32/ do
             dc.set('abc', 123)
           end
@@ -39,9 +34,9 @@ describe 'Sasl' do
       end
     end
 
-    it 'fail SASL authentication with wrong options' do
-      memcached(19124, '-S') do |dc|
-        dc = Dalli::Client.new('localhost:19124', :username => 'foo', :password => 'wrongpwd')
+    xit 'fail SASL authentication with wrong options' do
+      memcached_sasl_persistent do |dc, port|
+        dc = Dalli::Client.new("localhost:#{port}", :username => 'testuser', :password => 'testtest')
         assert_error Dalli::DalliError, /32/ do
           dc.set('abc', 123)
         end
@@ -65,7 +60,7 @@ describe 'Sasl' do
       end
 
       xit 'pass SASL authentication' do
-        memcached(19124, '-S') do |dc|
+        memcached_sasl_persistent do |dc|
           # I get "Dalli::DalliError: Error authenticating: 32" in OSX
           # but SASL works on Heroku servers. YMMV.
           assert_equal true, dc.set('abc', 123)
@@ -78,8 +73,8 @@ describe 'Sasl' do
     end
 
     xit 'pass SASL authentication with options' do
-      memcached(19124, '-S') do |dc|
-        dc = Dalli::Client.new('localhost:19124', :username => 'testuser', :password => 'testtest')
+        memcached_sasl_persistent do |dc, port|
+        dc = Dalli::Client.new("localhost:#{port}", sasl_credentials)
         # I get "Dalli::DalliError: Error authenticating: 32" in OSX
         # but SASL works on Heroku servers. YMMV.
         assert_equal true, dc.set('abc', 123)

data/test/test_serializer.rb

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

data/test/test_server.rb

@@ -2,11 +2,26 @@ require 'helper'
 
 describe Dalli::Server do
   describe 'hostname parsing' do
+    it 'handles unix socket with no weight' do
+      s = Dalli::Server.new('/var/run/memcached/sock')
+      assert_equal '/var/run/memcached/sock', s.hostname
+      assert_equal 1, s.weight
+      assert_equal :unix, s.socket_type
+    end
+
+    it 'handles unix socket with a weight' do
+      s = Dalli::Server.new('/var/run/memcached/sock:2')
+      assert_equal '/var/run/memcached/sock', s.hostname
+      assert_equal 2, s.weight
+      assert_equal :unix, s.socket_type
+    end
+
     it 'handles no port or weight' do
       s = Dalli::Server.new('localhost')
       assert_equal 'localhost', s.hostname
       assert_equal 11211, s.port
       assert_equal 1, s.weight
+      assert_equal :tcp, s.socket_type
     end
 
     it 'handles a port, but no weight' do
@@ -14,6 +29,7 @@ describe Dalli::Server do
       assert_equal 'localhost', s.hostname
       assert_equal 11212, s.port
       assert_equal 1, s.weight
+      assert_equal :tcp, s.socket_type
     end
 
     it 'handles a port and a weight' do
@@ -21,6 +37,7 @@ describe Dalli::Server do
       assert_equal 'localhost', s.hostname
       assert_equal 11212, s.port
       assert_equal 2, s.weight
+      assert_equal :tcp, s.socket_type
     end
 
     it 'handles ipv4 addresses' do
@@ -28,6 +45,7 @@ describe Dalli::Server do
       assert_equal '127.0.0.1', s.hostname
       assert_equal 11211, s.port
       assert_equal 1, s.weight
+      assert_equal :tcp, s.socket_type
     end
 
     it 'handles ipv6 addresses' do
@@ -35,6 +53,7 @@ describe Dalli::Server do
       assert_equal '::1', s.hostname
       assert_equal 11211, s.port
       assert_equal 1, s.weight
+      assert_equal :tcp, s.socket_type
     end
 
     it 'handles ipv6 addresses with port' do
@@ -42,6 +61,7 @@ describe Dalli::Server do
       assert_equal '::1', s.hostname
       assert_equal 11212, s.port
       assert_equal 1, s.weight
+      assert_equal :tcp, s.socket_type
     end
 
     it 'handles ipv6 addresses with port and weight' do
@@ -49,6 +69,7 @@ describe Dalli::Server do
       assert_equal '::1', s.hostname
       assert_equal 11212, s.port
       assert_equal 2, s.weight
+      assert_equal :tcp, s.socket_type
     end
 
     it 'handles a FQDN' do
@@ -56,6 +77,7 @@ describe Dalli::Server do
       assert_equal 'my.fqdn.com', s.hostname
       assert_equal 11211, s.port
       assert_equal 1, s.weight
+      assert_equal :tcp, s.socket_type
     end
 
     it 'handles a FQDN with port and weight' do
@@ -63,6 +85,14 @@ describe Dalli::Server do
       assert_equal 'my.fqdn.com', s.hostname
       assert_equal 11212, s.port
       assert_equal 2, s.weight
+      assert_equal :tcp, s.socket_type
+    end
+
+    it 'throws an exception if the hostname cannot be parsed' do
+      lambda { Dalli::Server.new('[]') }.must_raise Dalli::DalliError
+      lambda { Dalli::Server.new('my.fqdn.com:') }.must_raise Dalli::DalliError
+      lambda { Dalli::Server.new('my.fqdn.com:11212,:2') }.must_raise Dalli::DalliError
+      lambda { Dalli::Server.new('my.fqdn.com:11212:abc') }.must_raise Dalli::DalliError
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dalli
 version: !ruby/object:Gem::Version
-  version: 2.7.2
+  version: 2.7.3
 platform: ruby
 authors:
 - Mike Perham
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-17 00:00:00.000000000 Z
+date: 2015-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -81,7 +81,8 @@ files:
 - test/benchmark_test.rb
 - test/helper.rb
 - test/memcached_mock.rb
-- test/sasldb
+- test/sasl/memcached.conf
+- test/sasl/sasldb
 - test/test_active_support.rb
 - test/test_cas_client.rb
 - test/test_compressor.rb
@@ -115,7 +116,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: High performance memcached client for Ruby
@@ -123,7 +124,8 @@ test_files:
 - test/benchmark_test.rb
 - test/helper.rb
 - test/memcached_mock.rb
-- test/sasldb
+- test/sasl/memcached.conf
+- test/sasl/sasldb
 - test/test_active_support.rb
 - test/test_cas_client.rb
 - test/test_compressor.rb