jruby-memcached 0.1.0 → 0.2.0

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    jruby-memcached (0.0.1)
+    jruby-memcached (0.2.0)
 
 GEM
   remote: http://rubygems.org/

data/MIT-LICENSE

@@ -0,0 +1,20 @@
+Copyright (c) 2012 Richard Huang (flyerhzm@gmail.com)
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.md

@@ -1,7 +1,45 @@
-jruby-memcached
-===============
+# jruby-memcached
 
-we used memcached gem before, but now we are migrating to jruby, but
-memcached didn't support jruby platform, and we can't find any
-ruby/jruby gem that compatible with memcached, have to write it by
-ourselves.
+A jruby memcached gem which is compatible with evan's [memcached][0] gem
+
+## Install
+
+    gem install jruby-memcached
+
+## Usage
+
+Now, in Ruby, require the library and instantiate a Memcached object at
+a global level:
+
+    require 'memcached'
+    $cache = Memcached.new("localhost:11211")
+
+Now you can set things and get things:
+
+    value = 'hello'
+    $cache.set 'test', value
+    $cache.get 'test' #=> "hello"
+
+You can set with an expiration timeout:
+
+    value = 'hello'
+    $cache.set 'test', value, 1
+    sleep(2)
+    $cache.get 'test' #=> raises Memcached::NotFound
+
+You can get multiple values at once:
+
+    value = 'hello'
+    $cache.set 'test', value
+    $cache.set 'test2', value
+    $cache.get ['test', 'test2', 'missing']
+      #=> {"test" => "hello", "test2" => "hello"}
+
+## Benchmarks
+
+memcached.gem is the fastest memcached gem in MRI,
+jruby-memcached is the fastest memcached gem in JRuby.
+See [benchmark][1]
+
+[0]:"https://github.com/evan/memcached"
+[1]:"https://github.com/aurorafeint/jruby-memcached/blob/master/benchmark.rb"

data/benchmark.rb

@@ -17,7 +17,7 @@ dalli = Dalli::Client.new(['localhost:11211'])
   Benchmark.bm(30) {|bm|
     if JRUBY
       bm.report("jruby-memcached set") {
-        100_000.times { memcached.set('foo', 'bar').get }
+        100_000.times { memcached.set('foo', 'bar') }
       }
       bm.report("jruby-memcached get") {
         100_000.times { memcached.get('foo') }

data/jruby_memcached.gemspec

@@ -7,7 +7,7 @@ Gem::Specification.new do |s|
   s.version     = Memcached::VERSION
   s.authors     = ["Richard Huang"]
   s.email       = ["flyerhzm@gmail.com"]
-  s.homepage    = ""
+  s.homepage    = "https://github.com/aurorafeint/jruby-memcached"
   s.summary     = %q{jruby compatible memcached client}
   s.description = %q{jruby memcacached client which is compatible with memcached gem}
 

data/lib/memcached/exceptions.rb

@@ -1,3 +1,4 @@
 class Memcached::Error < RuntimeError; end
 class Memcached::NotFound < Memcached::Error; end
 class Memcached::NotStored < Memcached::Error; end
+class Memcached::NotSupport < Memcached::Error; end

data/lib/memcached/version.rb

@@ -1,3 +1,3 @@
 class Memcached
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

data/lib/memcached.rb

@@ -1,36 +1,55 @@
-  require 'java'
+require 'java'
 require 'memcached/version'
 require 'memcached/exceptions'
 require File.join(File.dirname(__FILE__), '../target/spymemcached-ext-0.0.1.jar')
 
+java_import 'net.spy.memcached.MemcachedClient'
+java_import 'net.spy.memcached.ConnectionFactoryBuilder'
+java_import 'net.spy.memcached.ConnectionFactoryBuilder$Locator'
+java_import 'net.spy.memcached.ConnectionFactoryBuilder$Protocol'
+java_import 'net.spy.memcached.DefaultHashAlgorithm'
+java_import 'net.spy.memcached.transcoders.SimpleTranscoder'
+java_import 'net.spy.memcached.AddrUtil'
+
 class Memcached
-  include_class 'java.net.InetSocketAddress'
-  include_class 'net.spy.memcached.MemcachedClient'
-  include_class 'net.spy.memcached.ConnectionFactoryBuilder'
-  include_class 'net.spy.memcached.ConnectionFactoryBuilder$Locator'
-  include_class 'net.spy.memcached.DefaultHashAlgorithm'
-  include_class 'net.spy.memcached.FailureMode'
-  include_class 'net.spy.memcached.transcoders.SimpleTranscoder'
-  include_class 'net.spy.memcached.AddrUtil'
 
   FLAGS = 0x0
   DEFAULTS = {
+    :binary_protocol => false,
     :default_ttl => 604800,
-    :exception_retry_limit => 5
+    :distribution => :consistent_ketama,
+    :exception_retry_limit => 5,
+    :hash => :fnv1_32,
   }
 
   attr_reader :options
   attr_reader :default_ttl
 
   def initialize(addresses, options={})
-    builder = ConnectionFactoryBuilder.new.
-                                       setLocatorType(Locator::CONSISTENT).
-                                       setHashAlg(DefaultHashAlgorithm::FNV1_32_HASH)
-    @client = MemcachedClient.new builder.build, AddrUtil.getAddresses(Array(addresses).join(' '))
-
     @options = DEFAULTS.merge(options)
     @default_ttl = @options[:default_ttl]
 
+    builder = ConnectionFactoryBuilder.new
+
+    @options[:distribution] = :consistent if @options[:distribution] == :ketama || @options[:distribution] == :consistent_ketama
+    unless [:array_mod, :consistent].include? @options[:distribution]
+      raise Memcached::NotSupport.new("#{@options[:distribution]} distribution algorithm doesn't support yet.")
+    end
+    distribution_algorithm = Locator.const_get @options[:distribution].to_s.upcase
+    builder.setLocatorType(distribution_algorithm)
+
+    if @options[:binary_protocol]
+      builder.setProtocol(Protocol::BINARY)
+    end
+
+    unless [:native, :crc, :fnv1_64, :fnv1a_64, :fnv1_32, :fnv1a_32, :ketama].include? @options[:hash]
+      raise Memcached::NotSupport.new("#{@options[:hash]} hash algorithm doesn't support yet.")
+    end
+    hash_algorithm = DefaultHashAlgorithm.const_get "#{@options[:hash]}_HASH".upcase
+    builder.setHashAlg hash_algorithm
+
+    @client = MemcachedClient.new builder.build, AddrUtil.getAddresses(Array(addresses).join(' '))
+
     @simple_transcoder = SimpleTranscoder.new
   end
 
@@ -38,7 +57,7 @@ class Memcached
     with_retry do
       value = encode(value, marshal, flags)
       @simple_transcoder.setFlags(flags)
-      @client.set(key, ttl, value.to_java_bytes, @simple_transcoder)
+      @client.set(key, ttl, value.to_java_bytes, @simple_transcoder).get
     end
   end
 

data/spec/memcached_spec.rb

@@ -2,16 +2,40 @@ require 'spec_helper'
 
 describe Memcached do
   context "localhost" do
-    before :all do
-      @memcached = Memcached.new("127.0.0.1:11211")
-    end
+    before(:all) { @memcached = Memcached.new("127.0.0.1:11211") }
+    after(:all) { @memcached.close }
 
-    after :all do
-      @memcached.close
+    it "should get all servers" do
+      @memcached.servers.should == ["127.0.0.1:11211"]
     end
 
-    it "should initialize with options" do
-      @memcached.servers.should == ["127.0.0.1:11211"]
+    context "initialize" do
+      before(:all) do
+        @memcached_with_options = Memcached.new("127.0.0.1:11211", :hash => :fnv1_32,
+                                                                   :distribution => :ketama,
+                                                                   :default_ttl => 900)
+      end
+      after(:all) { @memcached_with_options.close }
+
+      it "should with option hash" do
+        @memcached_with_options.options[:hash].should == :fnv1_32
+      end
+
+      it "should with option distribution" do
+        @memcached_with_options.options[:distribution].should == :consistent
+      end
+
+      it "should raise error with unsupported option hash" do
+        lambda { Memcached.new("127.0.0.1:11211", :hash => :unknown) }.should raise_error(Memcached::NotSupport)
+      end
+
+      it "should raise error with unsupported option distribution" do
+        lambda { Memcached.new("127.0.0.1:11211", :distribution => :unknown) }.should raise_error(Memcached::NotSupport)
+      end
+
+      it "should get default ttl" do
+        @memcached_with_options.default_ttl.should == 900
+      end
     end
 
     context "set/get" do

data/src/main/java/net/spy/memcached/transcoders/SimpleTranscoder.java

@@ -32,14 +32,11 @@ public class SimpleTranscoder implements Transcoder<Object> {
     }
 
     public CachedData encode(Object o) {
-        byte[] b = (byte[]) o;
-        return new CachedData(getFlags(), b, getMaxSize());
+        return new CachedData(getFlags(), (byte[]) o, getMaxSize());
     }
 
     public Object decode(CachedData d) {
-        byte[] data = d.getData();
-        int flags = d.getFlags();
-        return new ReturnData(flags, data);
+        return new ReturnData(d.getFlags(), d.getData());
     }
 
     public int getMaxSize() {

metadata

@@ -2,7 +2,7 @@
 name: jruby-memcached
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors: 
   - Richard Huang
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-07-24 00:00:00 Z
+date: 2012-07-29 00:00:00 Z
 dependencies: 
   - !ruby/object:Gem::Dependency 
     name: rspec
@@ -47,6 +47,7 @@ files:
   - .gitignore
   - Gemfile
   - Gemfile.lock
+  - MIT-LICENSE
   - README.md
   - Rakefile
   - benchmark.rb
@@ -62,7 +63,7 @@ files:
   - src/main/java/net/spy/memcached/transcoders/SimpleTranscoder.java
   - src/main/java/net/spy/memcached/util/DefaultKetamaNodeLocatorConfiguration.java
   - target/spymemcached-ext-0.0.1.jar
-homepage: ""
+homepage: https://github.com/aurorafeint/jruby-memcached
 licenses: []
 
 post_install_message: 
@@ -85,7 +86,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: jruby compatible memcached client