memcached 0.20.0 → 0.20.1

data/CHANGELOG

@@ -1,5 +1,7 @@
 
-v0.20.0. Add experimental module, with get_len() operator.
+v0.20.1. Better module naming. Oops.
+
+v0.20.0. Add experimental module, with get_len() operator (rgbenson).
 
 v0.19.10. Add no-op hash (MEMCACHED_HASH_NONE) to skip hashing when there is one server (bierbaum). Updated benchmark.
 

data/Manifest

@@ -19,7 +19,7 @@ lib/memcached.rb
 lib/memcached/auth.rb
 lib/memcached/behaviors.rb
 lib/memcached/exceptions.rb
-lib/memcached/experimental_memcached.rb
+lib/memcached/experimental.rb
 lib/memcached/integer.rb
 lib/memcached/memcached.rb
 lib/memcached/rails.rb

data/lib/memcached.rb

@@ -30,4 +30,4 @@ require 'memcached/behaviors'
 require 'memcached/auth'
 require 'memcached/memcached'
 require 'memcached/rails'
-require 'memcached/experimental_memcached'
+require 'memcached/experimental'

data/lib/memcached/experimental.rb

@@ -0,0 +1,35 @@
+class Memcached
+  module Experimental
+  
+    def get_len(bytes, keys)
+      if keys.is_a? ::Array
+        # Multi get
+        ret = Lib.memcached_mget_len(@struct, keys, bytes);
+        check_return_code(ret, keys)
+  
+        hash = {}
+        keys.each do
+          value, key, flags, ret = Lib.memcached_fetch_rvalue(@struct)
+          break if ret == Lib::MEMCACHED_END
+          if ret != Lib::MEMCACHED_NOTFOUND
+            check_return_code(ret, key)
+            # Assign the value
+            hash[key] = value
+          end
+        end
+        hash
+      else
+        # Single get_len
+        value, flags, ret = Lib.memcached_get_len_rvalue(@struct, keys, bytes)
+        check_return_code(ret, keys)
+        value
+      end
+    rescue => e
+      tries ||= 0
+      raise unless tries < options[:exception_retry_limit] && should_retry(e)
+      tries += 1
+      retry
+    end
+    
+  end
+end

data/lib/memcached/memcached.rb

@@ -119,10 +119,8 @@ Please note that when <tt>:no_block => true</tt>, update methods do not raise on
       options[:credentials] = [ENV["MEMCACHE_USERNAME"], ENV["MEMCACHE_PASSWORD"]]
     end
 
-    if options[:experimental_features]
-       instance_eval { send(:extend, ::ExperimentalMemcached) }
-    end
-
+    instance_eval { send(:extend, Experimental) } if options[:experimental_features]
+ 
     options[:binary_protocol] = true if options[:credentials] != nil
 
     # Force :buffer_requests to use :no_block

data/memcached.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{memcached}
-  s.version = "0.20.0"
+  s.version = "0.20.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Evan Weaver"]
@@ -11,8 +11,8 @@ Gem::Specification.new do |s|
   s.description = %q{An interface to the libmemcached C client.}
   s.email = %q{}
   s.extensions = ["ext/extconf.rb"]
-  s.extra_rdoc_files = ["BENCHMARKS", "CHANGELOG", "LICENSE", "README", "TODO", "lib/memcached.rb", "lib/memcached/behaviors.rb", "lib/memcached/exceptions.rb", "lib/memcached/experimental_memcached.rb", "lib/memcached/memcached.rb", "lib/memcached/rails.rb"]
-  s.files = ["BENCHMARKS", "CHANGELOG", "LICENSE", "Manifest", "README", "Rakefile", "TODO", "ext/extconf.rb", "ext/libmemcached-0.32.tar.gz", "ext/libmemcached-2.patch", "ext/libmemcached-3.patch", "ext/libmemcached-4.patch", "ext/libmemcached-5.patch", "ext/libmemcached.patch", "ext/rlibmemcached.i", "ext/rlibmemcached_wrap.c", "ext/sasl.patch", "lib/memcached.rb", "lib/memcached/auth.rb", "lib/memcached/behaviors.rb", "lib/memcached/exceptions.rb", "lib/memcached/experimental_memcached.rb", "lib/memcached/integer.rb", "lib/memcached/memcached.rb", "lib/memcached/rails.rb", "test/profile/benchmark.rb", "test/profile/profile.rb", "test/profile/valgrind.rb", "test/setup.rb", "test/teardown.rb", "test/test_helper.rb", "test/unit/binding_test.rb", "test/unit/memcached_experimental_test.rb", "test/unit/memcached_test.rb", "test/unit/rails_test.rb", "memcached.gemspec"]
+  s.extra_rdoc_files = ["BENCHMARKS", "CHANGELOG", "LICENSE", "README", "TODO", "lib/memcached.rb", "lib/memcached/behaviors.rb", "lib/memcached/exceptions.rb", "lib/memcached/memcached.rb", "lib/memcached/rails.rb"]
+  s.files = ["BENCHMARKS", "CHANGELOG", "LICENSE", "Manifest", "README", "Rakefile", "TODO", "ext/extconf.rb", "ext/libmemcached-0.32.tar.gz", "ext/libmemcached-2.patch", "ext/libmemcached-3.patch", "ext/libmemcached-4.patch", "ext/libmemcached-5.patch", "ext/libmemcached.patch", "ext/rlibmemcached.i", "ext/rlibmemcached_wrap.c", "ext/sasl.patch", "lib/memcached.rb", "lib/memcached/auth.rb", "lib/memcached/behaviors.rb", "lib/memcached/exceptions.rb", "lib/memcached/experimental.rb", "lib/memcached/integer.rb", "lib/memcached/memcached.rb", "lib/memcached/rails.rb", "test/profile/benchmark.rb", "test/profile/profile.rb", "test/profile/valgrind.rb", "test/setup.rb", "test/teardown.rb", "test/test_helper.rb", "test/unit/binding_test.rb", "test/unit/memcached_experimental_test.rb", "test/unit/memcached_test.rb", "test/unit/rails_test.rb", "memcached.gemspec"]
   s.homepage = %q{http://blog.evanweaver.com/files/doc/fauna/memcached/}
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Memcached", "--main", "README"]
   s.require_paths = ["lib", "ext"]

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 20
-  - 0
-  version: 0.20.0
+  - 1
+  version: 0.20.1
 platform: ruby
 authors: 
 - Evan Weaver
@@ -54,7 +54,6 @@ extra_rdoc_files:
 - lib/memcached.rb
 - lib/memcached/behaviors.rb
 - lib/memcached/exceptions.rb
-- lib/memcached/experimental_memcached.rb
 - lib/memcached/memcached.rb
 - lib/memcached/rails.rb
 files: 
@@ -79,7 +78,7 @@ files:
 - lib/memcached/auth.rb
 - lib/memcached/behaviors.rb
 - lib/memcached/exceptions.rb
-- lib/memcached/experimental_memcached.rb
+- lib/memcached/experimental.rb
 - lib/memcached/integer.rb
 - lib/memcached/memcached.rb
 - lib/memcached/rails.rb

data/lib/memcached/experimental_memcached.rb

@@ -1,31 +0,0 @@
-module ExperimentalMemcached
-  def get_len(user_spec_len, keys)
-    if keys.is_a? ::Array
-      # Multi get
-      ret = ::Memcached::Lib.memcached_mget_len(@struct, keys, user_spec_len);
-      check_return_code(ret, keys)
-
-      hash = {}
-      keys.each do
-        value, key, flags, ret = ::Memcached::Lib.memcached_fetch_rvalue(@struct)
-        break if ret == ::Memcached::Lib::MEMCACHED_END
-        if ret != ::Memcached::Lib::MEMCACHED_NOTFOUND
-          check_return_code(ret, key)
-          # Assign the value
-          hash[key] = value
-        end
-      end
-      hash
-    else
-      # Single get_len
-      value, flags, ret = ::Memcached::Lib.memcached_get_len_rvalue(@struct, keys, user_spec_len)
-      check_return_code(ret, keys)
-      value
-    end
-  rescue => e
-    tries ||= 0
-    raise unless tries < options[:exception_retry_limit] && should_retry(e)
-    tries += 1
-    retry
-  end
-end