dalli 0.9.7 → 0.9.8

data/History.md

@@ -1,6 +1,13 @@
 Dalli Changelog
 =====================
 
+0.9.8
+-----
+
+ - Implement namespace support
+ - Misc fixes
+
+
 0.9.7
 -----
 

data/TODO.md

@@ -3,3 +3,5 @@ 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
+ * Add noreply support for all commands
+ * Better pipelining support

data/lib/active_support/cache/dalli_store23.rb

@@ -68,8 +68,8 @@ module ActiveSupport
       def increment(key, amount = 1) # :nodoc:
         log("incrementing", key, amount)
         @data.incr(escape_key(key), amount)
-      rescue Dalli::DalliError
-        logger.error("DalliError (#{e}): #{e.message}")
+      rescue Dalli::DalliError => e
+        logger.error("DalliError (#{e}): #{e.message}") if logger
         nil
       end
 
@@ -80,8 +80,8 @@ module ActiveSupport
       def decrement(key, amount = 1) # :nodoc:
         log("decrement", key, amount)
         @data.decr(escape_key(key), amount)
-      rescue Dalli::DalliError
-        logger.error("DalliError (#{e}): #{e.message}")
+      rescue Dalli::DalliError => e
+        logger.error("DalliError (#{e}): #{e.message}") if logger
         nil
       end
 

data/lib/dalli/client.rb

@@ -167,7 +167,7 @@ module Dalli
         key = key.to_s
         args[0] = key
       end
-      validate_key(key)
+      args[0] = key = validate_key(key)
       server = ring.server_for_key(key)
       server.request(op, *args)
     end
@@ -176,6 +176,7 @@ module Dalli
       raise ArgumentError, "illegal character in key #{key.inspect}" if key =~ /\s/
       raise ArgumentError, "key cannot be blank" if key.nil? || key.strip.size == 0
       raise ArgumentError, "key too long #{key.inspect}" if key.length > 250
+      @options[:namespace] ? "#{@options[:namespace]}:#{key}" : key
     end
   end
 end

data/lib/dalli/server.rb

@@ -208,7 +208,7 @@ module Dalli
       data = read(count) if count > 0
       if status == 1
         nil
-      elsif status == 2
+      elsif status == 2 || status == 5
         false # Not stored, normal status for add operation
       elsif status != 0
         raise Dalli::DalliError, "Response error #{status}: #{RESPONSE_CODES[status]}"

data/lib/dalli/version.rb

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

data/test/memcached_mock.rb

@@ -1,5 +1,7 @@
 require "socket"
 
+$started = {}
+
 module MemcachedMock
   def self.start(port=19123, &block)
     server = TCPServer.new("localhost", port)
@@ -31,7 +33,7 @@ module MemcachedMock
           end
         end
 
-        sleep 0.5 # Give time for the socket to start listening.
+        sleep 0.3 # Give time for the socket to start listening.
         yield
       ensure
         if pid
@@ -66,15 +68,21 @@ module MemcachedMock
     def memcached(port=19122, args='')
       Memcached.path ||= find_memcached
       cmd = "#{Memcached.path}memcached #{args} -p #{port}"
-#      puts "Starting: #{cmd}..."
-      pid = IO.popen(cmd).pid
-      begin
-        sleep 0.5
-        yield Dalli::Client.new(["localhost:#{port}", "127.0.0.1:#{port}"])
-      ensure
-        Process.kill("TERM", pid)
-        Process.wait(pid)
+      $started[port] ||= begin
+        #puts "Starting: #{cmd}..."
+        pid = IO.popen(cmd).pid
+        at_exit do
+          begin
+            Process.kill("TERM", pid)
+            Process.wait(pid)
+          rescue Errno::ECHILD
+          end
+        end
+        sleep 0.2
+        pid
       end
+
+      yield Dalli::Client.new(["localhost:#{port}", "127.0.0.1:#{port}"])
     end
   end
 end

data/test/test_active_support.rb

@@ -118,6 +118,15 @@ class TestActiveSupport < Test::Unit::TestCase
           assert_equal ms.keys.sort, ds.keys.sort
           assert_equal ms[ms.keys.first].keys.sort, ds[ds.keys.first].keys.sort
 
+          assert_equal true, @dalli.write(:foo, 'a')
+          assert_equal true, @mc.write(:foo, 'a')
+
+          assert_equal true, @mc.exist?(:foo)
+          assert_equal true, @dalli.exist?(:foo)
+
+          assert_equal false, @mc.exist?(:bar)
+          assert_equal false, @dalli.exist?(:bar)
+
           @dalli.reset
         end
       end

data/test/test_dalli.rb

@@ -28,7 +28,7 @@ class TestDalli < Test::Unit::TestCase
 
   context 'using a live server' do
 
-    should "support huge get/set" do
+    should "support get/set" do
       memcached do |dc|
         dc.flush
 
@@ -43,6 +43,9 @@ class TestDalli < Test::Unit::TestCase
         dc.set('a', val1)
         val2 = dc.get('a')
         assert_equal val1, val2
+        
+        assert_equal true, dc.set('a', nil)
+        assert_nil dc.get('a')
       end
     end
 
@@ -188,6 +191,23 @@ class TestDalli < Test::Unit::TestCase
       end
     end
 
+    should 'support the append and prepend operations' do
+      memcached do |dc|
+        resp = dc.flush
+        assert_equal true, 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)
+
+        assert_raises Dalli::DalliError do
+          assert_equal '0xyz9', dc.get('456')
+        end
+
+        assert_equal false, dc.append('nonexist', 'abc')
+        assert_equal false, dc.prepend('nonexist', 'abc')
+      end
+    end
+
     should "pass a simple smoke test" do
       memcached do |dc|
         resp = dc.flush
@@ -241,7 +261,7 @@ class TestDalli < Test::Unit::TestCase
     end
     
     should "support multithreaded access" do
-      memcached(19123) do |cache|
+      memcached do |cache|
         cache.flush
         workers = []
 
@@ -280,13 +300,24 @@ class TestDalli < Test::Unit::TestCase
     end
 
     should 'gracefully handle authentication failures' do
-      memcached(19122, '-S') do |dc|
+      memcached(19124, '-S') do |dc|
         assert_raise Dalli::DalliError, /32/ do
           dc.set('abc', 123)
         end
       end
     end
 
+    should "handle namespaced keys" do
+      memcached do |dc|
+        dc = Dalli::Client.new('localhost:19122', :namespace => 'a')
+        dc.set('namespaced', 1)
+        dc2 = Dalli::Client.new('localhost:19122', :namespace => 'b')
+        dc2.set('namespaced', 2)
+        assert_equal 1, dc.get('namespaced')
+        assert_equal 2, dc2.get('namespaced')
+      end
+    end
+
     # OSX: Create a SASL user for the memcached application like so:
     #
     # saslpasswd2 -a memcached -c testuser
@@ -304,7 +335,7 @@ class TestDalli < Test::Unit::TestCase
       end
 
       should 'support SASL authentication' do
-        memcached(19121, '-S') do |dc|
+        memcached(19124, '-S') do |dc|
           # I get "Dalli::NetworkError: Error authenticating: 32" in OSX
           # but SASL works on Heroku servers. YMMV.
           assert_equal true, dc.set('abc', 123)

data/test/test_network.rb

@@ -6,7 +6,7 @@ class TestNetwork < Test::Unit::TestCase
 
     should 'handle connection refused' do
       assert_raise Dalli::NetworkError do
-        dc = Dalli::Client.new 'localhost:19123'
+        dc = Dalli::Client.new 'localhost:19333'
         dc.get 'foo'
       end
     end

metadata

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