dalli 0.9.1 → 0.9.2

data/History.md

@@ -1,6 +1,11 @@
 Dalli Changelog
 =====================
 
+0.9.2
+----
+
+ - Verify proper operation in Heroku.
+
 0.9.1
 ----
 

data/TODO.md

@@ -3,4 +3,3 @@ TODO
 
  * More of the memcached instruction set.  This will be done based on user demand.  Email me if the API is missing a feature you'd like to use.
  * Better API documentation
- * SASL for Heroku memcached add-on support.

data/lib/dalli/client.rb

@@ -21,7 +21,7 @@ module Dalli
     #
     def initialize(servers=nil, options={})
       @ring = Dalli::Ring.new(
-        Array(servers || env_servers).map do |s| 
+        Array(env_servers || servers).map do |s| 
           Dalli::Server.new(s)
         end, options
       )
@@ -148,7 +148,7 @@ module Dalli
     end
 
     def env_servers
-      ENV['MEMCACHE_SERVERS'].split(',')
+      ENV['MEMCACHE_SERVERS'] ? ENV['MEMCACHE_SERVERS'].split(',') : nil
     end
 
     # Chokepoint method for instrumentation

data/lib/dalli/server.rb

@@ -1,4 +1,5 @@
 require 'socket'
+require 'timeout'
 
 module Dalli
   class Server
@@ -263,16 +264,16 @@ module Dalli
       end
     end
 
-    def read(count)
+    def read(count, socket=connection)
       begin
         value = ''
         begin
           loop do
-            value << connection.sysread(count)
+            value << socket.sysread(count)
             break if value.size == count
           end
         rescue Errno::EAGAIN, Errno::EWOULDBLOCK
-          if IO.select([connection], nil, nil, TIMEOUT)
+          if IO.select([socket], nil, nil, TIMEOUT)
             retry
           else
             raise Timeout::Error, "IO timeout"
@@ -381,14 +382,16 @@ module Dalli
     def sasl_authentication(socket)
       init_sasl if !defined?(::SASL)
       
+      Dalli.logger.info { "Dalli/SASL authenticating as #{username}" }
+
       # negotiate
       req = [REQUEST, OPCODES[:auth_negotiation], 0, 0, 0, 0, 0, 0, 0].pack(FORMAT[:noop])
       socket.write(req)
-      header = socket.read(24)
+      header = read(24, socket)
       raise Dalli::NetworkError, 'No response' if !header
       (extras, status, count) = header.unpack(NORMAL_HEADER)
       raise Dalli::NetworkError, "Unexpected message format: #{extras} #{count}" unless extras == 0 && count > 0
-      content = socket.read(count)
+      content = read(count, socket)
       return (Dalli.logger.debug("Authentication not required/supported by server")) if status == 0x81
       mechanisms = content.split(' ')
 
@@ -400,16 +403,16 @@ module Dalli
       req = [REQUEST, OPCODES[:auth_request], mechanism.size, 0, 0, 0, mechanism.size + msg.size, 0, 0, mechanism, msg].pack(FORMAT[:auth_request])
       socket.write(req)
 
-      header = socket.read(24)
+      header = read(24, socket)
       raise Dalli::NetworkError, 'No response' if !header
       (extras, status, count) = header.unpack(NORMAL_HEADER)
       raise Dalli::NetworkError, "Unexpected message format: #{extras} #{count}" unless extras == 0 && count > 0
-      content = socket.read(count)
+      content = read(count, socket)
+      return Dalli.logger.info("Dalli/SASL: #{content}") if status == 0
+
       raise Dalli::NetworkError, "Error authenticating: #{status}" unless status == 0x21
       (step, msg) = sasl.receive('challenge', content)
       raise Dalli::NetworkError, "Authentication failed" if sasl.failed? || step != 'response'
-
-      
     end
   end
 end

data/lib/dalli/version.rb

@@ -1,3 +1,3 @@
 module Dalli
-  VERSION = '0.9.1'
+  VERSION = '0.9.2'
 end

data/test/test_network.rb

@@ -1,7 +1,7 @@
 require 'helper'
 
 class TestNetwork < Test::Unit::TestCase
-  
+
   context 'assuming a bad network' do
 
     should 'handle connection refused' do
@@ -10,12 +10,12 @@ class TestNetwork < Test::Unit::TestCase
         dc.get 'foo'
       end
     end
-    
+
     context 'with a fake server' do
 
       should 'handle connection reset' do
         memcached_mock(lambda {|sock| sock.close }) do
-          assert_error Dalli::NetworkError, /ECONNRESET/ do
+          assert_error Dalli::NetworkError, /ECONNRESET|EOFError/ do
             dc = Dalli::Client.new('localhost:19123')
             dc.get('abc')
           end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 9
-  - 1
-  version: 0.9.1
+  - 2
+  version: 0.9.2
 platform: ruby
 authors: 
 - Mike Perham