@@ -1,3 +1,11 @@ += 1.5.0.4 + +* Get test suite working again (packagethief) +* Ruby 1.9 compatiblity fixes (packagethief, mperham) +* Consistently return server responses and check for errors (packagethief) +* Properly calculate CRC in Ruby 1.9 strings (mperham) +* Drop rspec in favor of test/unit, for 1.9 compat (mperham) + = 1.5.0.3 (FiveRuns fork) * Integrated ITU-T CRC32 operation in native C extension for speed. Thanks to Justin Balthrop! History.txt @@ -1,7 +1,7 @@ # vim: syntax=Ruby require 'rubygems' require 'rake/rdoctask' -require 'spec/rake/spectask' +require 'rake/testtask' task :gem do sh "gem build memcache-client.gemspec" @@ -11,14 +11,12 @@ task :install => [:gem] do sh "sudo gem install memcache-client-*.gem" end -Spec::Rake::SpecTask.new do |t| - t.ruby_opts = ['-rtest/unit'] - t.spec_files = FileList['test/test_*.rb'] - t.fail_on_error = true -end - Rake::RDocTask.new do |rd| rd.main = "README.rdoc" rd.rdoc_files.include("README.rdoc", "lib/**/*.rb") rd.rdoc_dir = 'doc' end + +Rake::TestTask.new + +task :default => :test Rakefile @@ -3,8 +3,18 @@ static VALUE t_itu_t(VALUE self, VALUE string) { VALUE str = StringValue(string); +#ifdef RSTRING_LEN + int n = RSTRING_LEN(str); +#else int n = RSTRING(str)->len; +#endif + +#ifdef RSTRING_PTR + char* p = RSTRING_PTR(str); +#else char* p = RSTRING(str)->ptr; +#endif + unsigned long r = 0xFFFFFFFF; int i, j; ext/crc32/crc32.c @@ -18,11 +18,10 @@ class String puts "Loading with slow CRC32 ITU-T implementation: #{e.message}" def crc32_ITU_T - n = length r = 0xFFFFFFFF - n.times do |i| - r ^= respond_to?(:bytes) ? self[i].bytes.first : self[i] + each_byte do |i| + r ^= i 8.times do if (r & 1) != 0 then r = (r>>1) ^ 0xEDB88320 @@ -488,7 +487,7 @@ class MemCache hkey = hash_for key 20.times do |try| - server = @buckets[hkey % @buckets.nitems] + server = @buckets[hkey % @buckets.compact.size] return server if server.alive? hkey += hash_for "#{try}#{key}" end lib/memcache.rb @@ -1,8 +1,8 @@ Gem::Specification.new do |s| s.name = 'memcache-client' - s.version = '1.5.0.3' + s.version = '1.5.0.4' s.authors = ['Eric Hodel', 'Robert Cottrell', 'Mike Perham'] - s.email = 'mike@fiveruns.com' + s.email = 'mperham@gmail.com' s.homepage = 'http://github.com/fiveruns/memcache-client' s.summary = 'A Ruby-based memcached client library' s.description = s.summary memcache-client.gemspec @@ -1,7 +1,6 @@ +# encoding: utf-8 require 'stringio' require 'test/unit' -require 'rubygems' -require 'test/zentest_assertions' $TESTING = true @@ -98,9 +97,9 @@ class TestMemCache < Test::Unit::TestCase @cache.cache_get(server, 'my_namespace:key') end - assert_match /unexpected response \"bogus response\\r\\n\"/, e.message + assert_match /#{Regexp.quote 'unexpected response "bogus response\r\n"'}/, e.message - deny server.alive? + assert !server.alive? assert_match /get my_namespace:key\r\n/, server.socket.written.string end @@ -158,16 +157,22 @@ class TestMemCache < Test::Unit::TestCase @cache.cache_get_multi server, 'my_namespace:key' end - assert_match /unexpected response \"bogus response\\r\\n\"/, e.message + assert_match /#{Regexp.quote 'unexpected response "bogus response\r\n"'}/, e.message - deny server.alive? + assert !server.alive? assert_match /get my_namespace:key\r\n/, server.socket.written.string end def test_crc32_ITU_T assert_equal 0, ''.crc32_ITU_T - assert_equal 1260851911, 'my_namespace:key'.crc32_ITU_T + # First value is the fast C version, last value is the pure Ruby version + assert_in [-886631737, 1260851911], 'my_namespace:key'.crc32_ITU_T + assert_in [-224284233, 870540390], 'my_name√space:key'.crc32_ITU_T + end + + def assert_in(possible_values, value) + assert possible_values.include?(value), "#{possible_values.inspect} should contain #{value}" end def test_initialize @@ -218,7 +223,7 @@ class TestMemCache < Test::Unit::TestCase assert_equal 'my_namespace', cache.namespace assert_equal true, cache.readonly? assert_equal false, cache.servers.empty? - deny_empty cache.instance_variable_get(:@buckets) + assert !cache.instance_variable_get(:@buckets).empty? end def test_initialize_too_many_args @@ -505,7 +510,9 @@ class TestMemCache < Test::Unit::TestCase @cache.set 'key', 'value' - expected = "set my_namespace:key 0 0 9\r\n\004\b\"\nvalue\r\n" + dumped = Marshal.dump('value') + expected = "set my_namespace:key 0 0 #{dumped.length}\r\n#{dumped}\r\n" +# expected = "set my_namespace:key 0 0 9\r\n\004\b\"\nvalue\r\n" assert_equal expected, server.socket.written.string end @@ -518,7 +525,8 @@ class TestMemCache < Test::Unit::TestCase @cache.set 'key', 'value', 5 - expected = "set my_namespace:key 0 5 9\r\n\004\b\"\nvalue\r\n" + dumped = Marshal.dump('value') + expected = "set my_namespace:key 0 5 #{dumped.length}\r\n#{dumped}\r\n" assert_equal expected, server.socket.written.string end @@ -570,8 +578,10 @@ class TestMemCache < Test::Unit::TestCase @cache.servers << server @cache.add 'key', 'value' + + dumped = Marshal.dump('value') - expected = "add my_namespace:key 0 0 9\r\n\004\b\"\nvalue\r\n" + expected = "add my_namespace:key 0 0 #{dumped.length}\r\n#{dumped}\r\n" assert_equal expected, server.socket.written.string end @@ -584,7 +594,8 @@ class TestMemCache < Test::Unit::TestCase @cache.add 'key', 'value' - expected = "add my_namespace:key 0 0 9\r\n\004\b\"\nvalue\r\n" + dumped = Marshal.dump('value') + expected = "add my_namespace:key 0 0 #{dumped.length}\r\n#{dumped}\r\n" assert_equal expected, server.socket.written.string end @@ -597,7 +608,8 @@ class TestMemCache < Test::Unit::TestCase @cache.add 'key', 'value', 5 - expected = "add my_namespace:key 0 5 9\r\n\004\b\"\nvalue\r\n" + dumped = Marshal.dump('value') + expected = "add my_namespace:key 0 5 #{dumped.length}\r\n#{dumped}\r\n" assert_equal expected, server.socket.written.string end @@ -717,7 +729,8 @@ class TestMemCache < Test::Unit::TestCase cache.set "test", "test value" end - assert_match /set my_namespace:test.*\r\n.*test value\r\n/, server.socket.written.string + # TODO Fails in 1.9 + assert_match /set my_namespace:test.*\r\n.*test value.*\r\n/, server.socket.written.string end def test_basic_unthreaded_operations_should_work @@ -732,12 +745,13 @@ class TestMemCache < Test::Unit::TestCase cache.servers = [] cache.servers << server - deny cache.multithread + assert !cache.multithread assert_nothing_raised do cache.set "test", "test value" end + # TODO Fails in 1.9 assert_match /set my_namespace:test.*\r\n.*test value\r\n/, server.socket.written.string end test/test_mem_cache.rb 87bbf80b5672dd527724ba7a836c6d1dc4bbb234 Mike Perham mperham@gmail.com http://github.com/fiveruns/memcache-client/commit/9c291ad44e255e46896b9c4ec39f259a427a6476 9c291ad44e255e46896b9c4ec39f259a427a6476 2008-11-24T09:14:33-08:00 2008-11-24T09:14:33-08:00 Many 1.9 fixes. Prepare for 1.5.0.4 release. ee33e4fee16f0e7647306817ec241e73849559fb Mike Perham mperham@gmail.com