memcache-client 1.6.2 → 1.6.3

data/History.txt

@@ -1,3 +1,8 @@
+= 1.6.3 (2009-02-14)
+
+* Remove gem native extension in preference to RubyInline.  This allows the gem to install
+and work on JRuby and Ruby 1.8.5 when the native code fails to compile.
+
 = 1.6.2 (2009-02-04)
 
 * Validate that values are less than one megabyte in size.

data/lib/continuum.rb

@@ -1,31 +1,62 @@
 module Continuum
   POINTS_PER_SERVER = 160 # this is the default in libmemcached
 
-  begin
-    require 'binary_search' # try to load native extension
-  rescue LoadError => e
-    puts "Unable to load fast binary search, falling back to pure Ruby: #{e.message}"
-
-    # slow but pure ruby version
-    # Find the closest index in Continuum with value <= the given value
-    def self.binary_search(ary, value, &block)
-      upper = ary.size - 1
-      lower = 0
-      idx = 0
-
-      while(lower <= upper) do
-        idx = (lower + upper) / 2
-        comp = ary[idx].value <=> value
- 
-        if comp == 0
-          return idx
-        elsif comp > 0
-          upper = idx - 1
-        else
-          lower = idx + 1
+  class << self
+
+    begin
+      require 'inline'
+      inline do |builder|
+        builder.c <<-EOM
+        int binary_search(VALUE ary, unsigned int r) {
+            int upper = RARRAY_LEN(ary) - 1;
+            int lower = 0;
+            int idx = 0;
+            ID value = rb_intern("value");
+
+            while (lower <= upper) {
+                idx = (lower + upper) / 2;
+
+                VALUE continuumValue = rb_funcall(RARRAY_PTR(ary)[idx], value, 0);
+                unsigned int l = NUM2UINT(continuumValue);
+                if (l == r) {
+                    return idx;
+                }
+                else if (l > r) {
+                    upper = idx - 1;
+                }
+                else {
+                    lower = idx + 1;
+                }
+            }
+            return upper;
+        }
+        EOM
+      end
+    rescue Exception => e
+      puts "Unable to generate native code, falling back to Ruby: #{e.message}"
+
+      # slow but pure ruby version
+      # Find the closest index in Continuum with value <= the given value
+      def binary_search(ary, value, &block)
+        upper = ary.size - 1
+        lower = 0
+        idx = 0
+
+        while(lower <= upper) do
+          idx = (lower + upper) / 2
+          comp = ary[idx].value <=> value
+
+          if comp == 0
+            return idx
+          elsif comp > 0
+            upper = idx - 1
+          else
+            lower = idx + 1
+          end
         end
+        return upper
       end
-      return upper
+
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: memcache-client
 version: !ruby/object:Gem::Version 
-  version: 1.6.2
+  version: 1.6.3
 platform: ruby
 authors: 
 - Eric Hodel
@@ -11,16 +11,26 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-02-04 00:00:00 -06:00
+date: 2009-02-14 00:00:00 -06:00
 default_executable: 
-dependencies: []
-
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: 
+  - RubyInline
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
 description: A Ruby library for accessing memcached.
 email: mperham@gmail.com
 executables: []
 
-extensions: 
-- ext/memcache/extconf.rb
+extensions: []
+
 extra_rdoc_files: []
 
 files: 
@@ -31,7 +41,6 @@ files:
 - lib/continuum.rb
 - lib/memcache.rb
 - lib/memcache_util.rb
-- ext/memcache/binary_search.c
 has_rdoc: false
 homepage: http://github.com/mperham/memcache-client
 post_install_message: 

data/ext/memcache/binary_search.c

@@ -1,54 +0,0 @@
-#include "ruby.h"
-#include "stdio.h"
-
-/*
-def binary_search(ary, value)
-  upper = ary.size - 1
-  lower = 0
-  idx = 0
-
-  while(lower <= upper) do
-    idx = (lower + upper) / 2
-    comp = ary[idx].value <=> value
-
-    if comp == 0
-      return idx
-    elsif comp > 0
-      upper = idx - 1
-    else
-      lower = idx + 1
-    end
-  end
-  return upper
-end
-*/ 
-static VALUE binary_search(VALUE self, VALUE ary, VALUE number) {
-    int upper = RARRAY_LEN(ary) - 1;
-    int lower = 0;
-    int idx = 0;
-    unsigned int r = NUM2UINT(number);
-    ID value = rb_intern("value");
-    
-    while (lower <= upper) {
-        idx = (lower + upper) / 2;
-        
-        VALUE continuumValue = rb_funcall(RARRAY_PTR(ary)[idx], value, 0);
-        unsigned int l = NUM2UINT(continuumValue);
-        if (l == r) {
-            return INT2FIX(idx);
-        }
-        else if (l > r) {
-            upper = idx - 1;
-        }
-        else {
-            lower = idx + 1;
-        }
-    }
-    return INT2FIX(upper);
-}
- 
-VALUE cContinuum;
-void Init_binary_search() {
-  cContinuum = rb_define_module("Continuum");
-  rb_define_module_function(cContinuum, "binary_search", binary_search, 2);
-}

data/ext/memcache/extconf.rb

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