jruby-memcache-client 1.6.1 → 1.7.0

data/.gitignore

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

data/Rakefile

@@ -6,7 +6,8 @@ begin
     gemspec.email = "fred@fredjean.net"
     gemspec.homepage = "http://github.com/ikai/jruby-memcache-client"
     gemspec.description = "A drop in replacement for Ruby's memcache-client."
-    gemspec.authors = ["Abhi Yerra", "Ikai Lan", "Frederic Jean", "Lennon Day-Reynolds", "slyphon"]
+    gemspec.authors = ["Abhi Yerra", "Ikai Lan", "Frederic Jean", "Lennon Day-Reynolds",
+		"slyphon", "Brayn Helmkamp", "Travis Tilley"]
   end
 rescue LoadError
   puts "Jeweler not available. Install it with: sudo gem install technicalpickles-jeweler -s http://gems.github.com"

data/VERSION.yml

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

data/jruby-memcache-client.gemspec

@@ -1,15 +1,15 @@
 # Generated by jeweler
-# DO NOT EDIT THIS FILE
-# Instead, edit Jeweler::Tasks in Rakefile, and run `rake gemspec`
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{jruby-memcache-client}
-  s.version = "1.6.1"
+  s.version = "1.7.0"
 
   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"]
-  s.date = %q{2009-11-22}
+  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.extra_rdoc_files = [
@@ -22,7 +22,7 @@ Gem::Specification.new do |s|
      "Rakefile",
      "VERSION.yml",
      "jruby-memcache-client.gemspec",
-     "lib/java/java_memcached-release_2.0.1.jar",
+     "lib/java/memcached-dev_2.0.2.jar",
      "lib/memcache.rb",
      "spec/jruby_memcache_spec.rb"
   ]
@@ -45,3 +45,4 @@ Gem::Specification.new do |s|
   else
   end
 end
+

data/lib/memcache.rb

@@ -1,13 +1,14 @@
 require 'java'
 require 'base64'
 
-require File.dirname(__FILE__) + '/java/java_memcached-release_2.0.1.jar'
+require File.dirname(__FILE__) + '/java/memcached-dev_2.0.2.jar'
 
 class MemCache
-  include_class 'com.danga.MemCached.MemCachedClient'
-  include_class 'com.danga.MemCached.SockIOPool'
+  include_class 'com.meetup.memcached.MemcachedClient'
+  include_class 'com.meetup.memcached.SockIOPool'
+  include_class 'com.meetup.memcached.Logger'
 
-  VERSION = '1.6.0'
+  VERSION = '1.7.0'
 
   ##
   # Default options for the cache object.
@@ -16,15 +17,20 @@ class MemCache
     :namespace   => nil,
     :readonly    => false,
     :multithread => true,
-    :pool_initial_size => 5,
+    :pool_initial_size => 10,
     :pool_min_size => 5,
-    :pool_max_size => 250,
-    :pool_max_idle => (1000 * 60 * 60 * 6),
-    :pool_maintenance_thread_sleep => 30,
+    :pool_max_size => 100,
+    :pool_max_idle => (1000 * 60 * 5),
+    :pool_max_busy => (1000 * 30),
+    :pool_maintenance_thread_sleep => (1000 * 30),
+    :pool_socket_timeout => (1000 * 3),
+    :pool_socket_connect_timeout => (1000 * 3),
+    :pool_use_alive => false,
+    :pool_use_failover => true,
+    :pool_use_failback => true,
     :pool_use_nagle => false,
-    :pool_socket_timeout => 3000,
-    :pool_socket_connect_timeout => 3000,
-    :pool_name => 'default'
+    :pool_name => 'default',
+    :log_level => 2
   }
 
   ## CHARSET for Marshalling
@@ -85,8 +91,9 @@ class MemCache
     @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
     @client.sanitizeKeys = false
 
@@ -94,39 +101,35 @@ class MemCache
 
     @pool = SockIOPool.getInstance(@pool_name)
     unless @pool.initialized?
-      # // set the servers and the weights
       @pool.servers = @servers.to_java(:string)
       @pool.weights = weights.to_java(:Integer)
 
-      # // set some basic pool settings
-      # // 5 initial, 5 min, and 250 max conns
-      # // and set the max idle time for a conn
-      # // to 6 hours
       @pool.initConn = opts[:pool_initial_size]
       @pool.minConn = opts[:pool_min_size]
       @pool.maxConn = opts[:pool_max_size]
-      @pool.maxIdle = opts[:pool_max_idle]
 
-      # // set the sleep for the maint thread
-      # // it will wake up every x seconds and
-      # // maintain the pool size
+      @pool.maxIdle = opts[:pool_max_idle]
+      @pool.maxBusyTime = opts[:pool_max_busy]
       @pool.maintSleep = opts[:pool_maintenance_thread_sleep]
-      #
-      # // set some TCP settings
-      # // disable nagle
-      # // set the read timeout to 3 secs
-      # // and don't set a connect timeout
-      @pool.nagle = opts[:pool_use_nagle]
       @pool.socketTO = opts[:pool_socket_timeout]
       @pool.socketConnectTO = opts[:pool_socket_connect_timeout]
-      @pool.aliveCheck = true
-      @pool.initialize__method
+
+      @pool.failover = opts[:pool_use_failover]
+      @pool.failback = opts[:pool_use_failback]
+      @pool.aliveCheck = opts[:pool_use_alive]
+      @pool.nagle = opts[:pool_use_nagle]
+
+      # __method methods have been removed in jruby 1.5
+	  @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.initialize__method
+	@pool.java_send :initialize rescue @pool.initialize__method
   end
 
   ##

data/spec/jruby_memcache_spec.rb

@@ -2,13 +2,15 @@ require 'java'
 require File.dirname(__FILE__) + '/../lib/memcache'
 
 describe MemCache do
-  before(:all) do
+  before :all do
     @server = "127.0.0.1:11211"
     @client = MemCache.new @server
-    @client.flush_all
   end
 
-  after(:each) do
+  before :each do
+	  @client.flush_all
+  end
+  after :each do
     @client.flush_all
   end
 
@@ -36,6 +38,15 @@ describe MemCache 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
@@ -189,7 +200,7 @@ describe MemCache do
       @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"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: jruby-memcache-client
 version: !ruby/object:Gem::Version 
-  version: 1.6.1
+  version: 1.7.0
 platform: ruby
 authors: 
 - Abhi Yerra
@@ -9,11 +9,13 @@ authors:
 - Frederic Jean
 - Lennon Day-Reynolds
 - slyphon
+- Brayn Helmkamp
+- Travis Tilley
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2009-11-22 00:00:00 -07:00
+date: 2010-01-21 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -32,7 +34,7 @@ files:
 - Rakefile
 - VERSION.yml
 - jruby-memcache-client.gemspec
-- lib/java/java_memcached-release_2.0.1.jar
+- lib/java/memcached-dev_2.0.2.jar
 - lib/memcache.rb
 - spec/jruby_memcache_spec.rb
 has_rdoc: true