jruby-memcache-client 1.7.0 → 1.7.1

data/Gemfile

@@ -0,0 +1,7 @@
+source 'https://rubygems.org'
+
+gem 'jeweler'
+gem 'rake'
+gem 'rspec'
+gem 'pry'
+gem 'pry-nav'

data/Gemfile.lock

@@ -0,0 +1,44 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    coderay (1.0.8)
+    diff-lcs (1.1.3)
+    git (1.2.5)
+    jeweler (1.8.4)
+      bundler (~> 1.0)
+      git (>= 1.2.5)
+      rake
+      rdoc
+    json (1.7.6)
+    json (1.7.6-java)
+    method_source (0.8.1)
+    pry (0.9.11.4-java)
+      coderay (~> 1.0.5)
+      method_source (~> 0.8)
+      slop (~> 3.4)
+      spoon (~> 0.0)
+    pry-nav (0.2.3)
+      pry (~> 0.9.10)
+    rake (10.0.3)
+    rdoc (3.12)
+      json (~> 1.4)
+    rspec (2.12.0)
+      rspec-core (~> 2.12.0)
+      rspec-expectations (~> 2.12.0)
+      rspec-mocks (~> 2.12.0)
+    rspec-core (2.12.2)
+    rspec-expectations (2.12.1)
+      diff-lcs (~> 1.1.3)
+    rspec-mocks (2.12.1)
+    slop (3.4.3)
+    spoon (0.0.1)
+
+PLATFORMS
+  java
+
+DEPENDENCIES
+  jeweler
+  pry
+  pry-nav
+  rake
+  rspec

data/README

@@ -26,6 +26,11 @@ You will then be able to install the JRuby Memcache Client gem:
 
 jruby -S gem install jruby-memcache-client
 
+Java Requirements
+-----------------
+
+The underlying library used for this project was compiled using Java 6. You will not be able to run this gem under Java 5 out of the box. You can however clone http://github.com/gwhalin/Memcached-Java-Client and attempt to build it under Java 5 if you must. (You really should consider upgrading to Java 6 since Oracle no longer supports Java 5.)
+
 Replacing Rail's MemCache Client
 --------------------------------
 

data/Rakefile

@@ -15,13 +15,16 @@ end
 
 if RUBY_PLATFORM =~ /java/i
   begin
-    require 'spec/rake/spectask'
+    require 'rspec/core/rake_task'
 
     task :default => :spec
 
     desc "Run the specs for the jruby-memcache-client gem"
-    Spec::Rake::SpecTask.new
+    RSpec::Core::RakeTask.new(:spec)
   rescue LoadError
+
+    require 'pry'; binding.pry
+
     puts "You must have rspec installed in order to run the tests."
   end
 else

data/VERSION.yml

@@ -1,4 +1,5 @@
---- 
+---
 :major: 1
 :minor: 7
-:patch: 0
+:patch: 1
+:build:

data/jruby-memcache-client.gemspec

@@ -1,48 +1,59 @@
 # Generated by jeweler
 # DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{jruby-memcache-client}
-  s.version = "1.7.0"
+  s.name = "jruby-memcache-client"
+  s.version = "1.7.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Abhi Yerra", "Ikai Lan", "Frederic Jean", "Lennon Day-Reynolds", "slyphon", "Brayn Helmkamp", "Travis Tilley"]
-  s.date = %q{2010-01-21}
-  s.description = %q{A drop in replacement for Ruby's memcache-client.}
-  s.email = %q{fred@fredjean.net}
+  s.date = "2013-01-25"
+  s.description = "A drop in replacement for Ruby's memcache-client."
+  s.email = "fred@fredjean.net"
   s.extra_rdoc_files = [
     "README"
   ]
   s.files = [
-    ".gitignore",
-     "MIT-LICENSE",
-     "README",
-     "Rakefile",
-     "VERSION.yml",
-     "jruby-memcache-client.gemspec",
-     "lib/java/memcached-dev_2.0.2.jar",
-     "lib/memcache.rb",
-     "spec/jruby_memcache_spec.rb"
-  ]
-  s.homepage = %q{http://github.com/ikai/jruby-memcache-client}
-  s.rdoc_options = ["--charset=UTF-8"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.5}
-  s.summary = %q{A drop in replacement for Ruby's memcache-client.}
-  s.test_files = [
+    "Gemfile",
+    "Gemfile.lock",
+    "MIT-LICENSE",
+    "README",
+    "Rakefile",
+    "VERSION.yml",
+    "jruby-memcache-client.gemspec",
+    "lib/java/java_memcached-release_2.5.1.jar",
+    "lib/memcache.rb",
     "spec/jruby_memcache_spec.rb"
   ]
+  s.homepage = "http://github.com/ikai/jruby-memcache-client"
+  s.require_paths = ["lib"]
+  s.rubygems_version = "1.8.24"
+  s.summary = "A drop in replacement for Ruby's memcache-client."
 
   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
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<jeweler>, [">= 0"])
+      s.add_runtime_dependency(%q<rake>, [">= 0"])
+      s.add_runtime_dependency(%q<rspec>, [">= 0"])
+      s.add_runtime_dependency(%q<pry>, [">= 0"])
+      s.add_runtime_dependency(%q<pry-nav>, [">= 0"])
     else
+      s.add_dependency(%q<jeweler>, [">= 0"])
+      s.add_dependency(%q<rake>, [">= 0"])
+      s.add_dependency(%q<rspec>, [">= 0"])
+      s.add_dependency(%q<pry>, [">= 0"])
+      s.add_dependency(%q<pry-nav>, [">= 0"])
     end
   else
+    s.add_dependency(%q<jeweler>, [">= 0"])
+    s.add_dependency(%q<rake>, [">= 0"])
+    s.add_dependency(%q<rspec>, [">= 0"])
+    s.add_dependency(%q<pry>, [">= 0"])
+    s.add_dependency(%q<pry-nav>, [">= 0"])
   end
 end
 

data/lib/memcache.rb

@@ -1,14 +1,14 @@
 require 'java'
 require 'base64'
 
-require File.dirname(__FILE__) + '/java/memcached-dev_2.0.2.jar'
+require File.dirname(__FILE__) + '/java/java_memcached-release_2.5.1.jar'
 
 class MemCache
-  include_class 'com.meetup.memcached.MemcachedClient'
-  include_class 'com.meetup.memcached.SockIOPool'
-  include_class 'com.meetup.memcached.Logger'
+  java_import 'com.danga.MemCached.MemCachedClient'
+  java_import 'com.danga.MemCached.SockIOPool'
+  java_import 'com.danga.MemCached.Logger'
 
-  VERSION = '1.7.0'
+  VERSION = '1.7.1'
 
   ##
   # Default options for the cache object.
@@ -85,13 +85,22 @@ class MemCache
       raise ArgumentError, "wrong number of arguments (#{args.length} for 2)"
     end
 
+    # Normalizing the server(s) so they all have a port number.
+
+    @servers = @servers.map do |server|
+      server =~ /(.+):(\d+)/ ? server : "#{server}:#{DEFAULT_PORT}"
+    end
+
+    Logger.getLogger('com.meetup.memcached.MemcachedClient').setLevel(opts[:log_level])
+    Logger.getLogger('com.meetup.memcached.SockIOPool').setLevel(opts[:log_level])
+
     opts = DEFAULT_OPTIONS.merge opts
 
     @namespace = opts[:namespace] || opts["namespace"]
     @pool_name = opts[:pool_name] || opts["pool_name"]
     @readonly = opts[:readonly] || opts["readonly"]
 
-    @client = MemcachedClient.new(@pool_name)
+    @client = MemCachedClient.new(@pool_name)
 
     @client.error_handler = opts[:error_handler] if opts[:error_handler]
     @client.primitiveAsString = true
@@ -119,17 +128,25 @@ class MemCache
       @pool.aliveCheck = opts[:pool_use_alive]
       @pool.nagle = opts[:pool_use_nagle]
 
+      # public static final int NATIVE_HASH     = 0;        
+      #     // native String.hashCode();
+      # public static final int OLD_COMPAT_HASH = 1;        
+      #     // original compatibility hashing algorithm (works with other clients)
+      # public static final int NEW_COMPAT_HASH = 2;
+      #     // new CRC32 based compatibility hashing algorithm (works with other clients)
+      # public static final int CONSISTENT_HASH = 3;        
+      #     // MD5 Based -- Stops thrashing when a server added or removed
+      @pool.hashingAlg = opts[:pool_hashing_algorithm]
+
       # __method methods have been removed in jruby 1.5
-	  @pool.java_send :initialize rescue @pool.initialize__method
+      @pool.java_send :initialize rescue @pool.initialize__method
     end
 
-    Logger.getLogger('com.meetup.memcached.MemcachedClient').setLevel(opts[:log_level])
-    Logger.getLogger('com.meetup.memcached.SockIOPool').setLevel(opts[:log_level])
   end
 
   def reset
     @pool.shut_down
-	@pool.java_send :initialize rescue @pool.initialize__method
+    @pool.java_send :initialize rescue @pool.initialize__method
   end
 
   ##
@@ -163,9 +180,17 @@ class MemCache
     value = @client.get(make_cache_key(key))
     return nil if value.nil?
     unless raw
-      marshal_bytes = java.lang.String.new(value).getBytes(MARSHALLING_CHARSET)
-      decoded = Base64.decode64(String.from_java_bytes(marshal_bytes))
-      value = Marshal.load(decoded)
+      begin
+        marshal_bytes = java.lang.String.new(value).getBytes(MARSHALLING_CHARSET)
+        decoded = Base64.decode64(String.from_java_bytes(marshal_bytes))
+        value = Marshal.load(decoded)
+      rescue
+        value = case value
+          when /^\d+\.\d+$/ then value.to_f
+          when /^\d+$/ then value.to_i
+          else value
+        end
+      end
     end
     value
   end
@@ -183,9 +208,17 @@ class MemCache
       k,v = kv
       next if v.nil?
       unless raw
-        marshal_bytes = java.lang.String.new(v).getBytes(MARSHALLING_CHARSET)
-        decoded = Base64.decode64(String.from_java_bytes(marshal_bytes))
-        v = Marshal.load(decoded)
+        begin
+          marshal_bytes = java.lang.String.new(v).getBytes(MARSHALLING_CHARSET)
+          decoded = Base64.decode64(String.from_java_bytes(marshal_bytes))
+          v = Marshal.load(decoded)
+        rescue
+          v = case v
+            when /^\d+\.\d+$/ then v.to_f
+            when /^\d+$/ then v.to_i
+            else v
+          end
+        end
       end
       values[k] = v
     }
@@ -250,20 +283,18 @@ class MemCache
   # Increments the value associated with the key by a certain amount.
   def incr(key, amount = 1)
     raise MemCacheError, "Update of readonly cache" if @readonly
-    value = get(key) || 0
-    value += amount
-    set key, value
-    value
+    value = @client.incr(make_cache_key(key), amount)
+    return nil if value == "NOT_FOUND\r\n"
+    return value.to_i
   end
 
   ##
   # Decrements the value associated with the key by a certain amount.
   def decr(key, amount = 1)
     raise MemCacheError, "Update of readonly cache" if @readonly
-    value = get(key) || 0
-    value -= amount
-    set key, value
-    value
+    value = @client.decr(make_cache_key(key),amount)
+    return nil if value == "NOT_FOUND\r\n"
+    return value.to_i
   end
 
   ##
@@ -305,6 +336,7 @@ class MemCache
   end
 
   def marshal_value(value)
+    return value if value.kind_of?(Numeric)
     encoded = Base64.encode64(Marshal.dump(value))
     marshal_bytes = encoded.to_java_bytes
     java.lang.String.new(marshal_bytes, MARSHALLING_CHARSET)

data/spec/jruby_memcache_spec.rb

@@ -2,266 +2,270 @@ require 'java'
 require File.dirname(__FILE__) + '/../lib/memcache'
 
 describe MemCache do
-  before :all do
-    @server = "127.0.0.1:11211"
-    @client = MemCache.new @server
-  end
-
-  before :each do
-	  @client.flush_all
-  end
-  after :each do
-    @client.flush_all
-  end
-
-  it "should return nil for a non-existent key" do
-    @client.get('non-existent-key').should be_nil
-  end
-
-  describe "setting servers" do
-    it "should work if the instance is created with a single String argument" do
-      @client = MemCache.new @server
-      @client.servers.should == [@server]
-    end
-
-    it "should work if the instance is created with an Array" do
-      @client = MemCache.new [ @server ]
-      @client.servers.should == [ @server ]
-    end
-
-    it "should work if the instance is created with a Hash" do
-      @client = MemCache.new [ @server ], :namespace => 'test'
-      @client.servers.should == [ @server ]
-    end
-
-    it "should work with an explicit pool name" do
-      @client = MemCache.new([@server], :pool_name => 'new_pool')
-      @client.pool_name.should == 'new_pool'
-    end
-
-    it "should work with an error handler" do
-	  include_class 'com.meetup.memcached.MemcachedClient'
-      java_memcache_client = mock.as_null_object
-      MemcachedClient.stub!(:new => java_memcache_client)
-      error_handler = Object.new
-      java_memcache_client.should_receive(:error_handler=).with(error_handler)
-      @client = MemCache.new([@server], :error_handler => error_handler)
-    end
-  end
-
-  describe "namespacing" do
-    before(:each) do
-      @ns = 'namespace'
-      @nsclient = MemCache.new [ @server ] , :namespace => @ns
-      @nsclient.flush_all
-      @nsclient.set "test", 333, 0
-    end
-
-    it "should set and get values transparently" do
-      @nsclient.get("test").to_i.should == 333
-    end
-
-    it "should set values to the given namespace" do
-      @client.get("#{@ns}:test").to_i.should == 333
-    end
-
-    it "should not set a value without the given namespace" do
-      @client.get("test").to_i.should_not == 333
-    end
-
-    it "should delete values in the given namespace" do
-      @nsclient.delete "test"
-      @nsclient.get("test").should be_nil
-    end
-
-    it "should increment in the given namespace" do
-      @nsclient.incr("test").to_i.should == 334
-    end
-
-    it "should decrement values in the given namespace" do
-      @nsclient.decr("test").should == 332
-    end
-  end
-
-  describe "after setting a value to MemCache" do
-    before(:each) do
-      @client.set 'key', 'value'
-    end
-
-    it "should be able to retrieve the value" do
-      @client.get('key').should == 'value'
-    end
-
-    it "should not be able to retrieve the value after deleting" do
-      @client.delete('key')
-      @client.get('key').should be_nil
-    end
-
-    it "should not be able to retrieve the value after flushing everything" do
-      @client.flush_all
-      @client.get("key").should be_nil
-    end
-
-    it "should work exactly the same if the []= operator were used" do
-      @client['key'] = 'val'
-      @client.get('key').should == 'val'
-    end
-  end
 
-  describe "replacing values from the cache." do
-    before :each do
-      @client['key'] = 'value'
-    end
+  hostname = `hostname`.strip
 
-    it "should be able to replace the stored value." do
-      @client.replace('key', 'new value').should be_true
-      @client['key'].should == 'new value'
+  ["127.0.0.1:11211", "127.0.0.1", "localhost:11211", "localhost"].each do |server|
+    before :all do
+      @server = server
+      @normalized_server = @server =~ /(.+):(\d+)/ ? @server : "#{@server}:11211" 
     end
 
-    it "should not replace values that are not in the cache." do
-      @client.replace('notthere', 'value').should be_false
-    end
-  end
-
-  describe "using the Hash notation" do
     before :each do
-      @client['key'] = 'value'
-    end
-
-    it "should be able to retrieve the value using []" do
-      @client['key'].should == 'value'
-    end
-
-    it "should be able to retrieve the value using get" do
-      @client.get('key').should == 'value'
+      @client = MemCache.new @server
+      @client.should_not be_nil
+      @client.flush_all
     end
-  end
 
-  describe "#stats" do
-    it "should return a hash" do
-      @client.stats.should be_instance_of(Hash)
+    after :each do
+      @client.flush_all
     end
 
-    # it "should return 0 for curr_items" do
-    #   @client.stats[@server]['curr_items'].should == 0
-    # end
+    it "should return nil for a non-existent key" do
+      @client.get('non-existent-key').should be_nil
+    end
 
-    it "should return a float for rusage_system and rusage_user" do
-      @client.stats[@server]['rusage_system'].should be_instance_of(Float)
-      @client.stats[@server]['rusage_user'].should be_instance_of(Float)
-    end
+    describe "setting servers" do
+      it "should work if the instance is created with a single String argument" do
+        @client = MemCache.new @server
+        @client.servers.should == [@normalized_server]
+      end
 
-    it "should return a String for version" do
-      @client.stats[@server]['version'].should be_instance_of(String)
-    end
+      it "should work if the instance is created with an Array" do
+        @client = MemCache.new [ @server ]
+        @client.servers.should == [@normalized_server]
+      end
 
-  end
+      it "should work if the instance is created with a Hash" do
+        @client = MemCache.new [ @server ], :namespace => 'test'
+        @client.servers.should == [@normalized_server]
+      end
 
-  describe "#incr" do
+      it "should work with an explicit pool name" do
+        @client = MemCache.new([@server], :pool_name => 'new_pool')
+        @client.pool_name.should == 'new_pool'
+      end
 
-    it "should increment a value by 1 without a second parameter" do
-      @client.set 'incr', 100, 0
-      @client.incr 'incr'
-      @client.get('incr').to_i.should == 101
+      it "should work with an error handler" do
+        java_import 'com.danga.MemCached.MemCachedClient'
+        java_memcache_client = mock.as_null_object
+        MemCachedClient.stub!(:new => java_memcache_client)
+        error_handler = Object.new
+        java_memcache_client.should_receive(:error_handler=).with(error_handler)
+        @client = MemCache.new([@server], :error_handler => error_handler)
+      end
     end
 
-    it "should increment a value by a given second parameter" do
-      @client.set 'incr', 100, 0
-      @client.incr 'incr', 20
-      @client.get('incr').to_i.should == 120
-    end
-  end
-
-  describe "#decr" do
+    describe "namespacing" do
+      before(:each) do
+        @ns = 'namespace'
+        @nsclient = MemCache.new [ @server ] , :namespace => @ns
+        @nsclient.flush_all
+        @nsclient.set "test", 333, 0
+      end
 
-    it "should decrement a value by 1 without a second parameter" do
-      @client.set 'decr', 100, 0
-      @client.decr 'decr'
-      @client.get('decr').to_i.should == 99
-    end
-
-    it "should decrement a value by a given second parameter" do
-      @client.set 'decr', 100, 0
-      @client.decr 'decr', 20
-      @client.get('decr').to_i.should == 80
-    end
-  end
+      it "should set and get values transparently" do
+        @nsclient.get("test").should == 333
+      end
 
-  describe "with Ruby Objects" do
-    it "should be able to transparently set and get equivalent Ruby objects" do
-      obj = { :test => :hi }
-      @client.set('obj', obj)
-      @client.get('obj').should == obj
-    end
+      it "should set values to the given namespace" do
+        @nsclient.get("test").to_i.should == 333
+      end
 
-    it %[should work with those whose marshalled stream contains invalid UTF8 byte sequences] do
-      # this test fails w/o the Base64 encoding step
-      obj = { :foo => 900 }
-      @client.set('obj', obj)
-      @client.get('obj').should == obj
-    end
+      it "should not set a value without the given namespace" do
+        @client.get("test").to_i.should_not == 333
+      end
 
-    it %[should work with binary blobs] do
-      # this test fails w/o the Base64 encoding step
-      blob = "\377\330\377\340\000\020JFIF\000\001\001\000\000\001\000\001\000\000\377"
-      @client.set('blob', blob)
-      @client.get('blob').should == blob
-    end
-  end
+      it "should delete values in the given namespace" do
+        @nsclient.delete "test"
+        @nsclient.get("test").should be_nil
+      end
 
-  describe "using set with an expiration" do
-    it "should make a value unretrievable if the expiry is set to a negative value" do
-      @client.set('key', 'val', -1)
-      @client.get('key').should be_nil
-    end
+      it "should increment in the given namespace" do
+        @nsclient.incr("test").to_i.should == 334
+      end
 
-    it "should make a value retrievable for only the amount of time if a value is given" do
-      @client.set('key', 'val', 2)
-      @client.get('key').should == 'val'
-      sleep(3)
-      @client.get('key').should be_nil
+      it "should decrement values in the given namespace" do
+        @nsclient.decr("test").should == 332
+      end
     end
-  end
 
-  describe "#get_multi" do
-    it "should get 2 keys" do
-      @client.set('key', 'val')
-      @client.set('key2', 'val2')
-      @client.get_multi(%w/key key2/).should == {'key' => 'val', 'key2' => 'val2'}
-    end
+    describe "after setting a value to MemCache" do
+      before(:each) do
+        @client.set 'key', 'value'
+      end
 
-    it "should ignore nil values" do
-      @client.set('key', 'val')
-      @client.set('key2', 'val2')
-      @client.get_multi(%w/key key2 key3/).should == {'key' => 'val', 'key2' => 'val2'}
-    end
+      it "should be able to retrieve the value" do
+        @client.get('key').should == 'value'
+      end
 
-    it "should not marshall if requested" do
-      @client.set('key', 'val', 0, true)
-      @client.set('key2', 'val2', 0, true)
-      @client.get_multi(%w/key key2/, true).should == {'key' => 'val', 'key2' => 'val2'}
-    end
-  end
+      it "should not be able to retrieve the value after deleting" do
+        @client.delete('key')
+        @client.get('key').should be_nil
+      end
 
-  describe "aliveness of the MemCache server." do
-    before :each do
-      @servers = ["localhost:11211", "localhost:11212", {:pool_name => "test"}]
-      @client = MemCache.new @servers
-      @client.flush_all
-    end
+      it "should not be able to retrieve the value after flushing everything" do
+        @client.flush_all
+        @client.get("key").should be_nil
+      end
 
-    it "should report the client as being alive." do
-      @client.should be_alive
+      it "should work exactly the same if the []= operator were used" do
+        @client['key'] = 'val'
+        @client.get('key').should == 'val'
+      end
     end
 
-    it "should report localhost:11211 as being alive." do
-      servers = @client.servers
-      servers.first.should be_alive
-    end
+    describe "replacing values from the cache." do
+      before :each do
+        @client['key'] = 'value'
+      end
 
-    it "should report localhost:11212 as not being alive." do
-      servers = @client.servers
-      servers.find {|s| s.to_s == "localhost:11212"}.should be_nil
+      it "should be able to replace the stored value." do
+        @client.replace('key', 'new value').should be_true
+        @client['key'].should == 'new value'
+      end
+
+      it "should not replace values that are not in the cache." do
+        @client.replace('notthere', 'value').should be_false
+      end
+    end
+
+    describe "using the Hash notation" do
+      before :each do
+        @client['key'] = 'value'
+      end
+
+      it "should be able to retrieve the value using []" do
+        @client['key'].should == 'value'
+      end
+
+      it "should be able to retrieve the value using get" do
+        @client.get('key').should == 'value'
+      end
+    end
+
+    describe "#stats" do
+      it "should return a hash" do
+        @client.stats.should be_instance_of(Hash)
+      end
+
+      it "should return a float for rusage_system and rusage_user" do
+        @client.stats[@normalized_server]['rusage_system'].should be_instance_of(Float)
+        @client.stats[@normalized_server]['rusage_user'].should be_instance_of(Float)
+      end
+
+      it "should return a String for version" do
+        @client.stats[@normalized_server]['version'].should be_instance_of(String)
+      end
+
+    end
+
+    describe "#incr" do
+
+      it "should increment a value by 1 without a second parameter" do
+        @client.set 'incr', 100, 0
+        @client.incr 'incr'
+        @client.get('incr').to_i.should == 101
+      end
+
+      it "should increment a value by a given second parameter" do
+        @client.set 'incr', 100, 0
+        @client.incr 'incr', 20
+        @client.get('incr').to_i.should == 120
+      end
+    end
+
+    describe "#decr" do
+
+      it "should decrement a value by 1 without a second parameter" do
+        @client.set 'decr', 100, 0
+        @client.decr 'decr'
+        @client.get('decr').to_i.should == 99
+      end
+
+      it "should decrement a value by a given second parameter" do
+        @client.set 'decr', 100, 0
+        @client.decr 'decr', 20
+        @client.get('decr').to_i.should == 80
+      end
+    end
+
+    describe "with Ruby Objects" do
+      it "should be able to transparently set and get equivalent Ruby objects" do
+        obj = { :test => :hi }
+        @client.set('obj', obj)
+        @client.get('obj').should == obj
+      end
+
+      it %[should work with those whose marshalled stream contains invalid UTF8 byte sequences] do
+        # this test fails w/o the Base64 encoding step
+        obj = { :foo => 900 }
+        @client.set('obj', obj)
+        @client.get('obj').should == obj
+      end
+
+      it %[should work with binary blobs] do
+        # this test fails w/o the Base64 encoding step
+        blob = "\377\330\377\340\000\020JFIF\000\001\001\000\000\001\000\001\000\000\377"
+        @client.set('blob', blob)
+        @client.get('blob').should == blob
+      end
+    end
+
+    describe "using set with an expiration" do
+      it "should make a value unretrievable if the expiry is set to a negative value" do
+        @client.set('key', 'val', -1)
+        @client.get('key').should be_nil
+      end
+
+      it "should make a value retrievable for only the amount of time if a value is given" do
+        @client.set('key', 'val', 2)
+        @client.get('key').should == 'val'
+        sleep(3)
+        @client.get('key').should be_nil
+      end
+    end
+
+    describe "#get_multi" do
+      it "should get 2 keys" do
+        @client.set('key', 'val')
+        @client.set('key2', 'val2')
+        @client.get_multi(%w/key key2/).should == {'key' => 'val', 'key2' => 'val2'}
+      end
+
+      it "should ignore nil values" do
+        @client.set('key', 'val')
+        @client.set('key2', 'val2')
+        @client.get_multi(%w/key key2 key3/).should == {'key' => 'val', 'key2' => 'val2'}
+      end
+
+      it "should not marshall if requested" do
+        @client.set('key', 'val', 0, true)
+        @client.set('key2', 'val2', 0, true)
+        @client.get_multi(%w/key key2/, true).should == {'key' => 'val', 'key2' => 'val2'}
+      end
+    end
+
+    describe "aliveness of the MemCache server." do
+      before :each do
+        @servers = ["localhost:11211", "localhost:11212", {:pool_name => "test"}]
+        @client = MemCache.new @servers
+        @client.flush_all
+      end
+
+      it "should report the client as being alive." do
+        @client.should be_alive
+      end
+
+      it "should report localhost:11211 as being alive." do
+        servers = @client.servers
+        servers.first.should be_alive
+      end
+
+      it "should report localhost:11212 as not being alive." do
+        servers = @client.servers
+        servers.find {|s| s.to_s == "localhost:11212"}.should be_nil
+      end
     end
   end
 end

metadata

@@ -1,9 +1,10 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: jruby-memcache-client
-version: !ruby/object:Gem::Version 
-  version: 1.7.0
+version: !ruby/object:Gem::Version
+  prerelease:
+  version: 1.7.1
 platform: ruby
-authors: 
+authors:
 - Abhi Yerra
 - Ikai Lan
 - Frederic Jean
@@ -11,59 +12,145 @@ authors:
 - slyphon
 - Brayn Helmkamp
 - Travis Tilley
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-
-date: 2010-01-21 00:00:00 -07:00
-default_executable: 
-dependencies: []
-
+date: 2013-01-25 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: jeweler
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: !binary |-
+          MA==
+    none: false
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: !binary |-
+          MA==
+    none: false
+  prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency
+  name: rake
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: !binary |-
+          MA==
+    none: false
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: !binary |-
+          MA==
+    none: false
+  prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency
+  name: rspec
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: !binary |-
+          MA==
+    none: false
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: !binary |-
+          MA==
+    none: false
+  prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency
+  name: pry
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: !binary |-
+          MA==
+    none: false
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: !binary |-
+          MA==
+    none: false
+  prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency
+  name: pry-nav
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: !binary |-
+          MA==
+    none: false
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: !binary |-
+          MA==
+    none: false
+  prerelease: false
+  type: :runtime
 description: A drop in replacement for Ruby's memcache-client.
 email: fred@fredjean.net
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README
-files: 
-- .gitignore
+files:
+- Gemfile
+- Gemfile.lock
 - MIT-LICENSE
 - README
 - Rakefile
 - VERSION.yml
 - jruby-memcache-client.gemspec
-- lib/java/memcached-dev_2.0.2.jar
+- lib/java/java_memcached-release_2.5.1.jar
 - lib/memcache.rb
 - spec/jruby_memcache_spec.rb
-has_rdoc: true
 homepage: http://github.com/ikai/jruby-memcache-client
 licenses: []
-
-post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
-require_paths: 
+post_install_message:
+rdoc_options: []
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-  version: 
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-  version: 
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      segments:
+      - 0
+      hash: 2
+      version: !binary |-
+        MA==
+  none: false
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: !binary |-
+        MA==
+  none: false
 requirements: []
-
-rubyforge_project: 
-rubygems_version: 1.3.5
-signing_key: 
+rubyforge_project:
+rubygems_version: 1.8.24
+signing_key:
 specification_version: 3
 summary: A drop in replacement for Ruby's memcache-client.
-test_files: 
-- spec/jruby_memcache_spec.rb
+test_files: []

data/.gitignore

@@ -1,7 +0,0 @@
-.DS_Store
-nbproject/private
-*.swp
-*.orig
-pkg
-*.gem
-