spymemcached 0.2.1-java → 0.3.0-java

data/VERSION

@@ -1 +1 @@
-0.2.1
+0.3.0

data/lib/active_support/cache/spymemcached_store.rb

@@ -15,7 +15,7 @@ module ActiveSupport
 
       def read(key, options = nil)
         super
-        @cache.get(key, !(options && options[:raw]))
+        @cache.get(key, (options && options[:raw]))
       end
 
       # Set the key to the given value. Pass :unless_exist => true if you want to
@@ -23,7 +23,7 @@ module ActiveSupport
       def write(key, value, options = nil)
         super
         method = unless_exist?(options) ? :add : :set
-        @cache.send(method, key, value, expiry(options).to_i, !(options && options[:raw]))
+        @cache.send(method, key, value, expiry(options).to_i, (options && options[:raw]))
       end
 
       def delete(key, options = nil)

data/lib/spymemcached.rb

@@ -3,62 +3,100 @@ require "spymemcached/memcached-2.5.jar"
 
 class Spymemcached
   java_import "net.spy.memcached.MemcachedClient"
+  java_import "net.spy.memcached.transcoders.Transcoder"
+  java_import "net.spy.memcached.CachedData"
   java_import "java.net.InetSocketAddress"
+  java_import "java.util.concurrent.TimeUnit"
 
-  def initialize(servers)
-    @client = MemcachedClient.new(servers.map do |s|
+  class RubyTranscoder
+    include Transcoder
+
+    def asyncDecode(data)
+      false
+    end
+
+    def decode(data)
+      Marshal.load(String.from_java_bytes(data.getData))
+    end
+
+    def encode(obj)
+      CachedData.new(0, Marshal.dump(obj).to_java_bytes, getMaxSize)
+    end
+
+    def getMaxSize
+      CachedData::MAX_SIZE
+    end
+  end
+
+
+  def initialize(servers, transcoder = RubyTranscoder.new)
+    @transcoder = transcoder
+    @client     = MemcachedClient.new(servers.map do |s|
       host, port = s.split(":")
       InetSocketAddress.new(host, port.to_i)
     end)
   end
 
-  def set(key, value, expiration = 0, marshal = true)
-    @client.set(key, expiration, marshal(value, marshal))
+  def async_set(key, value, expiration = 0, raw = false)
+    @client.set(key, expiration, value, transcoder(raw))
   end
 
-  def get(key, marshal = true)
-    value = @client.get(key)
-    marshal && value ? marshal_load(value) : value
+  def set(key, value, expiration = 0, raw = false)
+    with_timeout async_set(key, value, expiration, raw)
+  end
+
+  def async_get(key, raw = false)
+    @client.asyncGet(key, transcoder(raw))
+  end
+
+  def get(key, raw = false)
+    with_timeout async_get(key, raw)
   end
 
   def incr(key, by = 1)
-    @client.incr(key, by)
+    with_timeout @client.asyncIncr(key, by)
   end
 
   def decr(key, by = 1)
-    @client.decr(key, by)
+    with_timeout @client.asyncDecr(key, by)
   end
 
   def append(key, value)
-    @client.append(0, key, value).get
+    with_timeout @client.append(0, key, value)
   end
 
   def prepend(key, value)
-    @client.prepend(0, key, value).get
+    with_timeout @client.prepend(0, key, value)
   end
 
-  def multiget(keys, marshal = true)
-    Hash[*@client.getBulk(*keys).map { |k,v| [k, marshal ? marshal_load(v) : v] }.flatten]
+  def multiget(keys, raw = false)
+    Hash[*with_timeout(@client.asyncGetBulk(keys, transcoder(raw))).to_a.flatten]
   end
+  alias get_multi multiget
 
-  def add(key, value, expiration = 0, marshal = true)
-    @client.add(key, expiration, marshal(value, marshal)).get
+  def add(key, value, expiration = 0, raw = false)
+    with_timeout @client.add(key, expiration, value, transcoder(raw))
   end
 
   def del(key)
-    @client.delete(key).get
+    with_timeout @client.delete(key)
   end
+  alias delete del
 
   def flush
     @client.flush
   end
 
   private
-    def marshal(value, marshal)
-      marshal ? Marshal.dump(value).to_java_bytes : value.to_s
-    end
+  def transcoder(raw = false)
+    raw ? @client.transcoder : @transcoder
+  end
 
-    def marshal_load(value)
-      Marshal.load(String.from_java_bytes(value))
+  def with_timeout(future, timeout = 0, unit = TimeUnit::MILLISECONDS)
+    if timeout > 0
+      future.get(timeout, unit)
+    else
+      future.get
     end
+  end
 end

data/spec/spymemcached_spec.rb

@@ -1,4 +1,5 @@
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+require 'rubygems'
 require "action_view"
 
 describe Spymemcached do
@@ -23,48 +24,48 @@ describe Spymemcached do
   end
 
   it "increments keys" do
-    @cache.set("number", "1", 0, false)
+    @cache.set("number", "1", 0, true)
     @cache.incr("number")
-    @cache.get("number", false).should == "2"
+    @cache.get("number", true).should == "2"
   end
 
   it "increments keys by a set amount" do
-    @cache.set("number", "1", 0, false)
+    @cache.set("number", "1", 0, true)
     @cache.incr("number", 2)
-    @cache.get("number", false).should == "3"
+    @cache.get("number", true).should == "3"
   end
 
   it "decrements keys" do
-    @cache.set("number", "2", 0, false)
+    @cache.set("number", "2", 0, true)
     @cache.decr("number")
-    @cache.get("number", false).should == "1"
+    @cache.get("number", true).should == "1"
   end
 
   it "decrements keys by a set amount" do
-    @cache.set("number", "2", 0, false)
+    @cache.set("number", "2", 0, true)
     @cache.decr("number", 2)
-    @cache.get("number", false).should == "0"
+    @cache.get("number", true).should == "0"
   end
 
   it "appends to keys" do
-    @cache.set("appendtome", "a", 0, false)
+    @cache.set("appendtome", "a", 0, true)
     @cache.append("appendtome", "b")
-    @cache.get("appendtome", false).should == "ab"
+    @cache.get("appendtome", true).should == "ab"
   end
 
   it "prepends to keys" do
-    @cache.set("prependtome", "b", 0, false)
+    @cache.set("prependtome", "b", 0, true)
     @cache.prepend("prependtome", "a")
-    @cache.get("prependtome", false).should == "ab"
+    @cache.get("prependtome", true).should == "ab"
   end
 
   it "returns boolean for prepend" do
-    @cache.set("prependtome", "b", 0, false)
+    @cache.set("prependtome", "b", 0, true)
     @cache.prepend("prependtome", "a").should == true
   end
 
   it "returns boolean for append" do
-    @cache.set("appendtome", "b", 0, false)
+    @cache.set("appendtome", "b", 0, true)
     @cache.append("appendtome", "a").should == true
   end
 
@@ -107,16 +108,6 @@ describe Spymemcached do
     @cache.get("a").should == {:a => "b"}
   end
 
-  it "supports setting and getting keys without marshalling the data" do
-    @cache.set("a", {:a => "b"}, 0, false)
-    @cache.get("a", false).should == {:a => "b"}.to_s
-  end
-  
-  it "supports adding keys without marshalling the data" do
-    @cache.add("a", {:a => "b"}, 0, false)
-    @cache.get("a", false).should == {:a => "b"}.to_s
-  end
-
   # not sure exactly why, but ActionView::SafeBuffer
   # is the only repeatable instance of this bug that
   # I can find
@@ -126,4 +117,21 @@ describe Spymemcached do
     @cache.get("a").should == s
     @cache.multiget(["a"]).should == {"a" => s}
   end
+
+  it "supports configurable transcoders" do
+    class NonsenseTranscoder < Spymemcached::RubyTranscoder
+      def decode(data)
+        "decoded"
+      end
+
+      def encode(object)
+        Spymemcached::CachedData.new(0, "encoded".to_java_bytes, getMaxSize)
+      end
+    end
+
+    @cache = Spymemcached.new(["localhost:11211"], NonsenseTranscoder.new)
+    @cache.set("a", "b")
+    @cache.get("a", true).should == "encoded"
+    @cache.get("a").should == "decoded"
+  end
 end

data/spymemcached.gemspec

@@ -5,12 +5,12 @@
 
 Gem::Specification.new do |s|
   s.name = %q{spymemcached}
-  s.version = "0.2.1"
+  s.version = "0.3.0"
   s.platform = %q{java}
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["James Golick"]
-  s.date = %q{2010-09-27}
+  s.date = %q{2010-09-28}
   s.description = %q{A jruby-only memcached client and rails cache store that uses spymemcached under the hood.}
   s.email = %q{jamesgolick@gmail.com}
   s.extra_rdoc_files = [

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
     - 0
-    - 2
-    - 1
-  version: 0.2.1
+    - 3
+    - 0
+  version: 0.3.0
 platform: java
 authors: 
   - James Golick
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-27 00:00:00 -07:00
+date: 2010-09-28 00:00:00 -07:00
 default_executable: 
 dependencies: 
   - !ruby/object:Gem::Dependency