fiveruns-memcache-client 1.5.0.4 → 1.5.0.5

data/History.txt

@@ -1,3 +1,8 @@
+= 1.5.0.5
+
+* Remove native C CRC32_ITU_T extension in favor of Zlib's crc32 method.
+  memcache-client is now pure Ruby again and will work with JRuby and Rubinius.
+
 = 1.5.0.4
 
 * Get test suite working again (packagethief)

data/lib/memcache.rb

@@ -4,38 +4,7 @@ require 'socket'
 require 'thread'
 require 'timeout'
 require 'rubygems'
-
-class String
-
-  ##
-  # Uses the ITU-T polynomial in the CRC32 algorithm.
-  begin
-    require 'crc32'
-    def crc32_ITU_T
-      CRC32.itu_t(self)
-    end
-  rescue LoadError => e
-    puts "Loading with slow CRC32 ITU-T implementation: #{e.message}"
-    
-    def crc32_ITU_T
-      r = 0xFFFFFFFF
-
-      each_byte do |i|
-        r ^= i
-        8.times do
-          if (r & 1) != 0 then
-            r = (r>>1) ^ 0xEDB88320
-          else
-            r >>= 1
-          end
-        end
-      end
-
-      r ^ 0xFFFFFFFF
-    end
-  end
-  
-end
+require 'zlib'
 
 ##
 # A Ruby client library for memcached.
@@ -500,7 +469,7 @@ class MemCache
   # sketchy for down servers).
 
   def hash_for(key)
-    (key.crc32_ITU_T >> 16) & 0x7fff
+    (Zlib.crc32(key) >> 16) & 0x7fff
   end
 
   ##

data/test/test_mem_cache.rb

@@ -164,17 +164,6 @@ class TestMemCache < Test::Unit::TestCase
     assert_match /get my_namespace:key\r\n/, server.socket.written.string
   end
 
-  def test_crc32_ITU_T
-    assert_equal 0, ''.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
     cache = MemCache.new :namespace => 'my_namespace', :readonly => true
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: fiveruns-memcache-client
 version: !ruby/object:Gem::Version 
-  version: 1.5.0.4
+  version: 1.5.0.5
 platform: ruby
 authors: 
 - Eric Hodel
@@ -19,8 +19,8 @@ description: A Ruby-based memcached client library
 email: mperham@gmail.com
 executables: []
 
-extensions: 
-- ext/crc32/extconf.rb
+extensions: []
+
 extra_rdoc_files: []
 
 files: 
@@ -30,7 +30,6 @@ files:
 - Rakefile
 - lib/memcache.rb
 - lib/memcache_util.rb
-- ext/crc32/crc32.c
 has_rdoc: false
 homepage: http://github.com/fiveruns/memcache-client
 post_install_message: 

data/ext/crc32/crc32.c

@@ -1,38 +0,0 @@
-#include "ruby.h"
-#include "stdio.h"
-
-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;
-
-  for (i = 0; i < n; i++) {
-    r = r ^ p[i];
-    for (j = 0; j < 8; j++) {
-      if ( (r & 1) != 0 ) {
-        r = (r >> 1) ^ 0xEDB88320;
-      } else {
-        r = r >> 1;
-      }
-    }
-  }
-  return INT2FIX(r ^ 0xFFFFFFFF);
-}
-
-VALUE cCRC32;
-void Init_crc32() {
-  cCRC32 = rb_define_module("CRC32");
-  rb_define_module_function(cCRC32, "itu_t", t_itu_t, 1);
-}

data/ext/crc32/extconf.rb

@@ -1,5 +0,0 @@
-require 'mkmf'
-
-dir_config("crc32")
-
-create_makefile("crc32")