dalli 0.9.6 → 0.9.7

data/History.md

@@ -1,6 +1,12 @@
 Dalli Changelog
 =====================
 
+0.9.7
+-----
+
+ - Small fix for NewRelic integration.
+ - Detect and fail on older memcached servers (pre-1.4).
+
 0.9.6
 -----
 

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
- * Detect and fail on older memcached servers (pre-1.4)

data/lib/dalli/client.rb

@@ -16,7 +16,7 @@ module Dalli
     #   :threadsafe - ensure that only one thread is actively using a socket at a time. Default: true.
     #
     def initialize(servers=nil, options={})
-      @servers = servers
+      @servers = servers || 'localhost:11211'
       @options = options
     end
     
@@ -104,7 +104,7 @@ module Dalli
     # If default is nil, the counter must already exist or the operation
     # will fail and will return nil.  Otherwise this method will return
     # the new value for the counter.
-    def incr(key, amt, ttl=0, default=nil)
+    def incr(key, amt=1, ttl=0, default=nil)
       raise ArgumentError, "Positive values only: #{amt}" if amt < 0
       perform(:incr, key, amt, ttl, default)
     end
@@ -119,7 +119,7 @@ module Dalli
     # If default is nil, the counter must already exist or the operation
     # will fail and will return nil.  Otherwise this method will return
     # the new value for the counter.
-    def decr(key, amt, ttl=0, default=nil)
+    def decr(key, amt=1, ttl=0, default=nil)
       raise ArgumentError, "Positive values only: #{amt}" if amt < 0
       perform(:decr, key, amt, ttl, default)
     end

data/lib/dalli/server.rb

@@ -15,7 +15,9 @@ module Dalli
       @weight = Integer(@weight)
       @down_at = nil
       connection
-      Dalli.logger.debug { "#{@hostname}:#{@port} running memcached v#{request(:version)}" }
+      @version = detect_memcached_version
+      raise NotImplementedError, "Dalli does not support memcached versions < 1.4.0, found #{@version} at #{@hostname}:#{@port}" if @version < '1.4.0'
+      Dalli.logger.debug { "#{@hostname}:#{@port} running memcached v#{@version}" }
     end
     
     # Chokepoint method for instrumentation
@@ -51,6 +53,19 @@ module Dalli
 
     private
 
+    def detect_memcached_version
+      # HACK, the server does not appear to have a way to negotiate the protocol.
+      # If you ask for the version in text, the socket is immediately locked to the text
+      # protocol.  All we can do is use binary and handle the failure if the server is old.
+      # Alternative suggestions welcome.
+      begin
+        binary_version
+      rescue Dalli::NetworkError
+        sleep 1
+        text_version
+      end
+    end
+
     def down!
       close
       @down_at = Time.now.to_i
@@ -147,12 +162,6 @@ module Dalli
       generic_response
     end
 
-    def version
-      req = [REQUEST, OPCODES[:version], 0, 0, 0, 0, 0, 0, 0].pack(FORMAT[:noop])
-      write(req)
-      generic_response
-    end
-
     def stats(info='')
       req = [REQUEST, OPCODES[:stat], info.size, 0, 0, 0, info.size, 0, 0, info].pack(FORMAT[:stat])
       write(req)
@@ -165,6 +174,18 @@ module Dalli
       cas_response
     end
 
+    def binary_version
+      req = [REQUEST, OPCODES[:version], 0, 0, 0, 0, 0, 0, 0].pack(FORMAT[:noop])
+      write(req)
+      generic_response
+    end
+
+    def text_version
+      write("version\r\n")
+      connection.gets =~ /VERSION (.*)\r\n/
+      $1
+    end
+
     def cas_response
       header = read(24)
       raise Dalli::NetworkError, 'No response' if !header

data/lib/dalli/version.rb

@@ -1,3 +1,3 @@
 module Dalli
-  VERSION = '0.9.6'
+  VERSION = '0.9.7'
 end

data/test/test_dalli.rb

@@ -2,6 +2,30 @@ require 'helper'
 require 'memcached_mock'
 
 class TestDalli < Test::Unit::TestCase
+
+  should "default to localhost:11211" do
+    dc = Dalli::Client.new
+    ring = dc.send(:ring)
+    s1 = ring.servers.first.hostname
+    assert_equal 1, ring.servers.size
+    dc.close
+
+    dc = Dalli::Client.new('localhost:11211')
+    ring = dc.send(:ring)
+    s2 = ring.servers.first.hostname
+    assert_equal 1, ring.servers.size
+    dc.close
+
+    dc = Dalli::Client.new(['localhost:11211'])
+    ring = dc.send(:ring)
+    s3 = ring.servers.first.hostname
+    assert_equal 1, ring.servers.size
+    dc.close
+
+    assert_equal s1, s2
+    assert_equal s2, s3
+  end
+
   context 'using a live server' do
 
     should "support huge get/set" do

data/test/test_network.rb

@@ -12,6 +12,9 @@ class TestNetwork < Test::Unit::TestCase
     end
 
     context 'with a fake server' do
+      setup do
+        Dalli::Server.any_instance.expects(:detect_memcached_version).returns('1.4.5')
+      end
 
       should 'handle connection reset' do
         memcached_mock(lambda {|sock| sock.close }) do

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 9
-  - 6
-  version: 0.9.6
+  - 7
+  version: 0.9.7
 platform: ruby
 authors: 
 - Mike Perham
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-16 00:00:00 -07:00
+date: 2010-09-17 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency