memcache 1.2.0 → 1.2.1

data/test/memcache_server_test_helper.rb

@@ -1,34 +1,74 @@
 require File.dirname(__FILE__) + '/test_helper'
 
 module MemcacheServerTestHelper
-  def m
-    @memcache
+  def test_prefix
+    assert_equal nil, m.prefix = nil
+    assert_equal nil, m.prefix
+
+    m.set('1', 'baz', 0)
+    m.set('2', 'bar', 0)
+
+    assert_equal nil,   m.prefix
+    assert_equal 'foo', m.prefix = 'foo'
+    assert_equal 'foo', m.prefix
+
+    m.set('2', 'foo', 0)
+    assert_equal nil,   m.get('1')
+    assert_equal 'foo', m.get('2')
+    assert_equal({'2'=>'foo'}, m.get(['1', '2']))
+
+    assert_equal 'bar:', m.prefix = 'bar:'
+    assert_equal 'bar:', m.prefix
+
+    assert_equal nil, m.prefix = nil
+    assert_equal nil, m.prefix
+
+    assert_equal 'baz', m.get('1')
+    assert_equal 'bar', m.get('2')
+    assert_equal({'1'=>'baz','2'=>'bar'}, m.get(['1', '2']))
   end
 
   def test_set_and_get
-    m.set(2, 'foo', 0)
-    
+    assert_equal 'foo', m.set('2', 'foo', 0)
+
     assert_equal 'foo', m.get('2')
     assert_equal 'foo', m.get('2')
 
-    m.set(2, 'bar', 0)
+    assert_equal 'bar', m.set('2', 'bar', 0)
 
     assert_equal 'bar', m.get('2')
     assert_equal 'bar', m.get('2')
   end
 
+  def test_spaces_in_keys
+    assert_equal '1', m.set('foo bar', '1', 0)
+
+    assert_equal '1', m.get('foo bar')
+    assert_equal '1', m.get('foo bar')
+
+    assert_equal '2', m.set('foo bar', '2', 0)
+
+    assert_equal '2', m.get('foo bar')
+    assert_equal '2', m.get('foo bar')
+
+    assert_equal '8', m.set('foo baz', '8', 0)
+
+    expected = { 'foo bar' => '2', 'foo baz' => '8' }
+    assert_equal expected, m.get(['foo bar','foo baz'])
+  end
+
   def test_expiry
-    m.set('foo', 'foo', 1)
+    assert_equal 'foo', m.set('foo', 'foo', 1)
     assert_equal 'foo', m.get('foo')
 
-    m.add('bar', 'bar', 1)
+    assert_equal 'bar', m.add('bar', 'bar', 1)
     assert_equal 'bar', m.get('bar')
 
-    m.set('baz', '')
-    m.replace('baz', 'baz', '1')
+    assert_equal '',    m.set('baz', '')
+    assert_equal 'baz', m.replace('baz', 'baz', 1)
     assert_equal 'baz', m.get('baz')
 
-    m.set('bam', 'bap', Time.now + 1)
+    assert_equal 'bap', m.set('bam', 'bap', (Time.now + 1).to_i)
     assert_equal 'bap', m.get('bam')
 
     sleep 2
@@ -41,114 +81,114 @@ module MemcacheServerTestHelper
 
   def test_add_and_replace
     # Replace should do nothing if key doesn't exist.
-    m.replace('foo', 'bar')
+    assert_equal nil, m.replace('foo', 'bar')
     assert_equal nil, m.get('foo')
 
     # Add should only work if key doesn't exist.
-    m.add('foo', 'foo')
+    assert_equal 'foo', m.add('foo', 'foo')
     assert_equal 'foo', m.get('foo')
     assert_equal nil,   m.add('foo', 'bar')
     assert_equal 'foo', m.get('foo')
-    
+
     # Replace should only work if key doesn't exist.
-    m.replace('foo', 'bar')
+    assert_equal 'bar', m.replace('foo', 'bar')
     assert_equal 'bar', m.get('foo')
   end
 
   def test_append_and_prepend
-    m.append('foo', 'bar')
+    assert_equal false, m.append('foo', 'bar')
     assert_equal nil, m.get('foo')
 
     m.set('foo', 'foo')
-    m.append('foo', 'bar')
+    assert_equal true, m.append('foo', 'bar')
     assert_equal 'foobar', m.get('foo')
 
-    m.prepend('foo', 'baz')
+    assert_equal true, m.prepend('foo', 'baz')
     assert_equal 'bazfoobar', m.get('foo')
   end
 
   def test_incr
     # incr does nothing if value doesn't exist
-    m.incr('foo')
+    assert_equal nil, m.incr('foo')
     assert_equal nil, m.get('foo')
 
-    m.decr('foo', 1)
+    assert_equal nil, m.decr('foo', 1)
     assert_equal nil, m.get('foo')
 
     m.set('foo', '0')
-    m.incr('foo')
+    assert_equal 1, m.incr('foo')
     assert_equal '1', m.get('foo')
 
-    m.incr('foo', 52)
+    assert_equal 53, m.incr('foo', 52)
     assert_equal '53', m.get('foo')
 
-    m.decr('foo', 43)
+    assert_equal 10, m.decr('foo', 43)
     assert_equal '10', m.get('foo')
 
     # Cannot go below zero.
-    m.decr('foo', 100)
+    assert_equal 0, m.decr('foo', 100)
     assert_equal '0', m.get('foo').strip
   end
 
   def test_multi_get
-    m.set(2, '1,2,3')
-    m.set(3, '4,5')
-    
+    m.set('2', '1,2,3')
+    m.set('3', '4,5')
+
     expected = { '2' => '1,2,3', '3' => '4,5' }
-    assert_equal expected, m.get([2,3])
+    assert_equal expected, m.get(['2','3'])
+    assert_equal '4,5', m.get(['3'])['3']
+    assert_equal({}, m.get([]))
   end
-  
+
   def test_delete
-    m.set(2, '1,2,3')
-    
-    assert_equal '1,2,3', m.get(2)
+    m.set('2', '1,2,3')
 
-    m.delete(2)
-    
-    assert_equal nil, m.get(2)
+    assert_equal '1,2,3', m.get('2')
+    assert_equal true, m.delete('2')
+    assert_equal nil, m.get('2')
   end
 
   def test_flush_all
-    m.set(2, 'bar')
-    
-    assert_equal 'bar', m.get(2)
+    m.set('2', 'bar')
+
+    assert_equal 'bar', m.get('2')
 
     m.flush_all
-    
-    assert_equal nil, m.get(2)
+
+    assert_equal nil, m.get('2')
   end
-  
+
   module AdvancedMethods
     def test_flags
       m.set('thom', 'hartmann', 0)
       value = m.gets('thom')
       assert_equal 0, value.memcache_flags
-      
+
       m.set('thom', 'hartmann', 0, 0b11110001)
       value = m.gets('thom')
       assert_equal 0b11110001, value.memcache_flags
-      
+
       value = m.get('thom')
       assert_equal 0b11110001, value.memcache_flags
-      
+
       m.set('thom', 'hartmann', 0, 0b10101010)
       value = m.get('thom')
       assert_equal 0b10101010, value.memcache_flags
     end
-    
+
     def test_gets_and_cas
       m.set('thom', 'hartmann')
-      
-      value = m.gets('thom')    
+
+      value = m.gets('thom')
       assert_equal 'hartmann', value
-      m.cas('thom', 'thompson', value.memcache_cas)
+      assert_equal 'thompson', m.cas('thom', 'thompson', value.memcache_cas)
       assert_equal 'thompson', m.get('thom')
-      
+
       value = m.gets('thom')
       m.delete('thom')
       assert_nil m.cas('thom', 'hartson', value.memcache_cas)
       assert_equal nil, m.get('thom')
-      
+
       m.add('thom', 'hartmann')
       value = m.gets('thom')
       m.set('thom', 'foo')

data/test/memcache_test.rb

@@ -3,33 +3,25 @@ require File.dirname(__FILE__) + '/test_helper'
 
 class MemcacheTest < Test::Unit::TestCase
   PORTS = [11212, 11213, 11214, 11215, 11216, 11217]
-
-  def m
-    @memcache
-  end
-
   def setup
-    start_memcache(*PORTS)
-    @memcache = Memcache.new(:servers => PORTS.collect {|p| "localhost:#{p}"})
-  end
-    
-  def teardown
-    stop_memcache(*PORTS)
+    init_memcache(*PORTS) do
+      Memcache.new(:servers => PORTS.collect {|p| "localhost:#{p}"})
+    end
   end
 
-  def test_get_and_set    
+  def test_get_and_set
     100.times do |i|
       m.set(i.to_s, i)
       assert_equal i, m.get(i.to_s)
     end
 
-    keys = (0..200).to_a
+    keys = (0..200).collect {|key| key.to_s}
     results = m.get(keys)
     assert_equal 100, results.size
     results.each do |key, value|
       assert_equal key.to_i, value
     end
-    
+
     100.times do |i|
       m.set(i.to_s, i.to_s, :raw => true)
       assert_equal i.to_s, m.get(i.to_s, :raw => true)
@@ -68,7 +60,7 @@ class MemcacheTest < Test::Unit::TestCase
       assert_equal nil, m.get(i.to_s, :raw => true)
 
       m.add(i.to_s, 'homerun', :raw => true)
-      assert_equal 'homerun', m.get(i.to_s, :raw => true)      
+      assert_equal 'homerun', m.get(i.to_s, :raw => true)
     end
   end
 
@@ -92,7 +84,7 @@ class MemcacheTest < Test::Unit::TestCase
       assert_equal [i, :foo], m["foo#{i}"]
 
       m.get_or_set("foo#{i}") {raise}
-      assert_equal [i, :foo], m["foo#{i}"]    
+      assert_equal [i, :foo], m["foo#{i}"]
 
       # Overwrite if changed.
       m.get_or_set("bar#{i}") do
@@ -109,7 +101,7 @@ class MemcacheTest < Test::Unit::TestCase
       assert_equal [:foo, i], m["foo#{i}"]
 
       m.get_or_add("foo#{i}") {raise}
-      assert_equal [:foo, i], m["foo#{i}"]    
+      assert_equal [:foo, i], m["foo#{i}"]
 
       # Don't overwrite if changed.
       m.get_or_add("bar#{i}") do
@@ -141,7 +133,7 @@ class MemcacheTest < Test::Unit::TestCase
       assert_equal i, m.get(i.to_s)
     end
 
-    keys = (0...200).to_a
+    keys = (0...200).collect {|key| key.to_s}
     results = m.get_some(keys) do |missing_keys|
       assert_equal 100, missing_keys.size
       r = {}
@@ -160,7 +152,7 @@ class MemcacheTest < Test::Unit::TestCase
   def test_get_with_reset_expiry
     m.add('foo', 'quick brown fox', :expiry => 1)
     assert_equal 'quick brown fox', m.get('foo', :expiry => 2)
-    sleep(1)    
+    sleep(1)
     assert_equal 'quick brown fox', m.get('foo')
   end
 

data/test/test_helper.rb

@@ -7,20 +7,45 @@ require 'pp'
 $LOAD_PATH.unshift(File.dirname(__FILE__) + '/../lib')
 require 'memcache'
 
-system 'killall memcached 2> /dev/null'
-
 class Test::Unit::TestCase
-  def start_memcache(*ports)
+  @@servers ||= {}
+  def init_memcache(*ports)
     ports.each do |port|
-      system("memcached -p #{port} -U 0 -d -P /tmp/memcached_#{port}.pid")
+      @@servers[port] ||= start_memcache(port)
     end
-    sleep 0.1
+
+    @memcache = yield
+    @memcache.flush_all
   end
 
-  def stop_memcache(*ports)
-    ports.each do |port|
-      pid = File.read("/tmp/memcached_#{port}.pid").to_i
-      Process.kill('TERM', pid)
+  def m
+    @memcache
+  end
+
+  def start_memcache(port)
+    system("memcached -p #{port} -U 0 -d -P /tmp/memcached_#{port}.pid")
+    sleep 1
+    File.read("/tmp/memcached_#{port}.pid")
+  end
+
+  def self.with_prefixes(*prefixes)
+    # Define new test_* methods that calls super for every prefix. This only works for
+    # methods that are mixed in, and should be called before you define custom test methods.
+    opts = prefixes.last.is_a?(Hash) ? prefixes.last : {}
+    instance_methods.each do |method_name|
+      next unless method_name =~ /^test_/
+      next if opts[:except] and opts[:except].include?(method_name)
+      next if opts[:only] and not opts[:only].include?(method_name)
+
+      define_method(method_name) do |*args|
+        prefixes.each do |prefix|
+          assert_equal prefix, m.prefix = prefix
+          assert_equal prefix, m.prefix
+          super
+          assert_equal nil, m.prefix = nil
+          assert_equal nil, m.prefix
+        end
+      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: memcache
 version: !ruby/object:Gem::Version 
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors: 
 - Justin Balthrop
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-17 00:00:00 -08:00
+date: 2010-03-17 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -28,17 +28,23 @@ files:
 - README.rdoc
 - Rakefile
 - VERSION.yml
+- bench/benchmark.rb
+- ext/extconf.rb
+- ext/libmemcached-0.38.tar.gz
+- ext/native_server.c
 - lib/memcache.rb
+- lib/memcache/base.rb
 - lib/memcache/local_server.rb
 - lib/memcache/migration.rb
 - lib/memcache/null_server.rb
 - lib/memcache/pg_server.rb
-- lib/memcache/segmented_server.rb
+- lib/memcache/segmented.rb
 - lib/memcache/server.rb
-- memcache.gemspec
 - test/memcache_local_server_test.rb
+- test/memcache_native_server_test.rb
 - test/memcache_null_server_test.rb
 - test/memcache_pg_server_test.rb
+- test/memcache_segmented_native_server_test.rb
 - test/memcache_segmented_server_test.rb
 - test/memcache_server_test.rb
 - test/memcache_server_test_helper.rb
@@ -74,8 +80,10 @@ specification_version: 3
 summary: Advanced ruby memcache client
 test_files: 
 - test/memcache_local_server_test.rb
+- test/memcache_native_server_test.rb
 - test/memcache_null_server_test.rb
 - test/memcache_pg_server_test.rb
+- test/memcache_segmented_native_server_test.rb
 - test/memcache_segmented_server_test.rb
 - test/memcache_server_test.rb
 - test/memcache_server_test_helper.rb

data/memcache.gemspec

@@ -1,69 +0,0 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
-# -*- encoding: utf-8 -*-
-
-Gem::Specification.new do |s|
-  s.name = %q{memcache}
-  s.version = "1.2.0"
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Justin Balthrop"]
-  s.date = %q{2009-12-17}
-  s.description = %q{Ruby client for memcached supporting advanced protocol features and pluggable architecture.}
-  s.email = %q{code@justinbalthrop.com}
-  s.extensions = ["ext/extconf.rb"]
-  s.extra_rdoc_files = [
-    "LICENSE",
-     "README.rdoc"
-  ]
-  s.files = [
-    ".gitignore",
-     "LICENSE",
-     "README.rdoc",
-     "Rakefile",
-     "VERSION.yml",
-     "lib/memcache.rb",
-     "lib/memcache/local_server.rb",
-     "lib/memcache/migration.rb",
-     "lib/memcache/null_server.rb",
-     "lib/memcache/pg_server.rb",
-     "lib/memcache/segmented_server.rb",
-     "lib/memcache/server.rb",
-     "memcache.gemspec",
-     "test/memcache_local_server_test.rb",
-     "test/memcache_null_server_test.rb",
-     "test/memcache_pg_server_test.rb",
-     "test/memcache_segmented_server_test.rb",
-     "test/memcache_server_test.rb",
-     "test/memcache_server_test_helper.rb",
-     "test/memcache_test.rb",
-     "test/test_helper.rb"
-  ]
-  s.homepage = %q{http://github.com/ninjudd/memcache}
-  s.rdoc_options = ["--charset=UTF-8"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.5}
-  s.summary = %q{Advanced ruby memcache client}
-  s.test_files = [
-    "test/memcache_local_server_test.rb",
-     "test/memcache_null_server_test.rb",
-     "test/memcache_pg_server_test.rb",
-     "test/memcache_segmented_server_test.rb",
-     "test/memcache_server_test.rb",
-     "test/memcache_server_test_helper.rb",
-     "test/memcache_test.rb",
-     "test/test_helper.rb"
-  ]
-
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
-
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-    else
-    end
-  else
-  end
-end
-