spymemcached.jruby 1.0.10-java → 1.0.11-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8eb6188bd806396129dbd6186e427323e48454e2
-  data.tar.gz: f30b1e50f0d2630ef62eac42553f6f09d5e6a6be
+  metadata.gz: 06b5837f82e9d9ac407c2c5fe0bb5ee5daf8a3b0
+  data.tar.gz: 3edb71d0e84508cb9447ea68a4cf1a8f9bb44f27
 SHA512:
-  metadata.gz: 462954604f84eca014be63ab9048356d8571e26fca26feb204c984ae0dbc8ba8aec38d66fd5c44db8288cdaa8a466dff3640b6aa81b9c72f27f900e6764db111
-  data.tar.gz: eef22bc388f1ed4450b4b8928b554c7efeb4bd41aa597e2180d2145d0665314692ce02b7f73ebb31fb7f1fef85ea64ed43b2bd73d1b57386da6eb97d850c20cf
+  metadata.gz: e48238823c00d32dd5ba47ed7efc66b9c101a202f26132a9c2d5fa8eb4f0cf0376b8333d49a4b64ae03aab85189511583c9ab01ca4b74dc977567a894e598d86
+  data.tar.gz: be02cf6b0e7c8959424e73b777d5b0bfabf867feea3640fcf6dd7980143d67891e67187c337a2de0bab78148efac7fcedb8fe16b375665012e91d632aee58cfd

data/README.md

@@ -22,9 +22,10 @@ Setup multiple servers with options
 
 Valid +options+ are:
 
-    [:namespace]   Prepends this value to all keys added or retrieved.
-    [:timeout]     Time to use as the socket read timeout, seconds.  Defaults to 0.5 sec.
-    [:binary]      Talks binary protocol with Memcached server. Default to true.
+    [:namespace]        Prepends this value to all keys added or retrieved.
+    [:timeout]          Time to use as the socket read timeout, seconds.  Defaults to 0.5 sec.
+    [:binary]           Talks binary protocol with Memcached server. Default to true.
+    [:should_optimize]  If true, Spymemcached low-level optimization is in effect. Default to false.
 
 ### Rails 4
 
@@ -40,19 +41,6 @@ Use [spymemcached_store](https://github.com/ThoughtWorksStudios/spymemcached_sto
     require 'spymemcached'
     ActionController::Base.cache_store = :mem_cache_store, Spymemcached.new(servers, options).rails23
 
-## Compatibility
-
-The most important different between spymemcached.jruby and other non spymemcached backended memcache client is the support of option :raw.
-
-As Spymemcached provides mechanism to encode and decode cache data, spymemcached.jruby does marshal dump & load for Ruby object in Java except Ruby string and integer.
-
-Any Ruby String or Integer type cache data will be directly converted to Java String or Integer.
-
-Hence we don't consider :raw option in spymemcached.jruby.
-
-However, Rails cache store supports :raw option too when doing read and write on local cache.
-This behaviour is kept as I'm not sure what to do with it. I'm happy to fix it if you found anything wrong with it.
-
 ## Default behaviors
 
 Spymemcached.jruby applies:

data/lib/spymemcached.rb

@@ -14,7 +14,8 @@ class Spymemcached
   # default options for client
   DEFAULT_OPTIONS = {
     :timeout => 0.5, # second
-    :binary => true
+    :binary => true,
+    :should_optimize => false
   }
 
   # Accepts a list of +servers+ and a list of +options+.
@@ -26,9 +27,10 @@ class Spymemcached
   #
   # Valid +options+ are:
   #
-  #   [:namespace]   Prepends this value to all keys added or retrieved.
-  #   [:timeout]     Time to use as the socket read timeout, seconds.  Defaults to 0.5 sec.
-  #   [:binary]      Talks binary protocol with Memcached server. Default to true.
+  #   [:namespace]        Prepends this value to all keys added or retrieved. Default to nil.
+  #   [:timeout]          Time to use as the socket read timeout, seconds. Default to 0.5 sec.
+  #   [:binary]           Talks binary protocol with Memcached server. Default to true.
+  #   [:should_optimize]  If true, Spymemcached low-level optimization is in effect. Default to false.
   #
   # Logger: see Spymemcached for how to turn on detail log
   #
@@ -61,21 +63,21 @@ class Spymemcached
     Hash[@client.get_multi(key_map.keys).map {|k, v| [key_map[k], v]}]
   end
 
-  def add(key, value, ttl=0)
-    @client.add(encode(key), value, ttl)
+  def add(key, value, ttl=0, opts={})
+    @client.add(encode(key), value, ttl, opts[:raw])
   end
 
-  def set(key, value, ttl=0)
-    @client.set(encode(key), value, ttl)
+  def set(key, value, ttl=0, opts={})
+    @client.set(encode(key), value, ttl, opts[:raw])
   end
   alias :[]= :set
 
-  def cas(key, ttl=0, &block)
-    @client.cas(encode(key), ttl, &block)
+  def cas(key, ttl=0, opts={}, &block)
+    @client.cas(encode(key), ttl, opts[:raw], &block)
   end
 
-  def replace(key, value, ttl=0)
-    @client.replace(encode(key), value, ttl)
+  def replace(key, value, ttl=0, opts={})
+    @client.replace(encode(key), value, ttl, opts[:raw])
   end
 
   def delete(key)
@@ -91,11 +93,11 @@ class Spymemcached
   end
 
   def append(key, value)
-    @client.append(encode(key), value)
+    @client.append(encode(key), value.to_s)
   end
 
   def prepend(key, value)
-    @client.prepend(encode(key), value)
+    @client.prepend(encode(key), value.to_s)
   end
 
   def touch(key, ttl=0)

data/lib/spymemcached/rails23.rb

@@ -25,12 +25,12 @@ class Spymemcached
       op(:get, key)
     end
 
-    def add(key, value, ttl=0, *args)
-      op(:add, key, value, ttl) ? Response::STORED : Response::NOT_STORED
+    def add(key, value, ttl=0, raw=false)
+      op(:add, key, value, ttl, opts(raw)) ? Response::STORED : Response::NOT_STORED
     end
 
-    def set(key, value, ttl=0, *args)
-      op(:set, key, value, ttl) ? Response::STORED : Response::NOT_STORED
+    def set(key, value, ttl=0, raw=false)
+      op(:set, key, value, ttl, opts(raw)) ? Response::STORED : Response::NOT_STORED
     end
 
     def delete(key, *args)
@@ -54,6 +54,10 @@ class Spymemcached
     end
 
     private
+    def opts(raw)
+      raw.is_a?(Hash) ? raw : {:raw => raw}
+    end
+
     def op(name, *args, &block)
       @client.send(name, *args, &block)
     rescue Spymemcached::Error => e

data/test/spymemcached_binary_protocol_test.rb

@@ -39,7 +39,7 @@ class SpymemcachedBinaryProtocolTest < Test::Unit::TestCase
   end
 
   def test_incr_and_decr
-    @client.add('key', '0')
+    @client.add('key', '0', 0, :raw => true)
     assert_equal 0, @client.incr('key', 0)
     @client.incr('key')
     assert_equal 1, @client.incr('key', 0)
@@ -47,16 +47,16 @@ class SpymemcachedBinaryProtocolTest < Test::Unit::TestCase
     assert_equal 6, @client.incr('key', 0)
     assert_equal '6', @client.get('key')
 
-    @client.set('key', '6')
+    @client.set('key', '6', 0, :raw => true)
     @client.decr('key')
     assert_equal 5, @client.decr('key', 0)
     @client.decr('key', 3)
     assert_equal 2, @client.decr('key', 0)
 
-    @client.replace('key', '10')
+    @client.replace('key', '10', 0, :raw => true)
     assert_equal 11, @client.incr('key')
 
-    @client.cas('key') { '7' }
+    @client.cas('key', 0, :raw => true) { '7' }
     assert_equal 8, @client.incr('key')
 
     assert_equal 100, @client.incr('incr_key', 1, 0, 100)
@@ -115,14 +115,18 @@ class SpymemcachedBinaryProtocolTest < Test::Unit::TestCase
   end
 
   def test_append_string
-    @client['k1'] = 'v'
+    @client.set('k1', 'v', 0, :raw => true)
     assert @client.append('k1', '1')
     assert_equal 'v1', @client['k1']
+    assert @client.append('k1', 2)
+    assert_equal 'v12', @client['k1']
   end
 
   def test_prepend_string
-    @client['k1'] = 'v'
+    @client.set('k1', 'v', 0, :raw => true)
     assert @client.prepend('k1', '1')
     assert_equal '1v', @client['k1']
+    assert @client.prepend('k1', 2)
+    assert_equal '21v', @client['k1']
   end
 end

data/test/spymemcached_plain_protocol_test.rb

@@ -39,7 +39,7 @@ class SpymemcachedPlainProtocolTest < Test::Unit::TestCase
   end
 
   def test_incr_and_decr
-    @client.add('key', '0')
+    @client.add('key', '0', 0, :raw => true)
     assert_equal 0, @client.incr('key', 0)
     @client.incr('key')
     assert_equal 1, @client.incr('key', 0)
@@ -47,16 +47,16 @@ class SpymemcachedPlainProtocolTest < Test::Unit::TestCase
     assert_equal 6, @client.incr('key', 0)
     assert_equal '6', @client.get('key')
 
-    @client.set('key', '6')
+    @client.set('key', '6', 0, :raw => true)
     @client.decr('key')
     assert_equal 5, @client.decr('key', 0)
     @client.decr('key', 3)
     assert_equal 2, @client.decr('key', 0)
 
-    @client.replace('key', '10')
+    @client.replace('key', '10', 0, :raw => true)
     assert_equal 11, @client.incr('key')
 
-    @client.cas('key') { '7' }
+    @client.cas('key', 0, :raw => true) { '7' }
     assert_equal 8, @client.incr('key')
 
     assert_equal 100, @client.incr('incr_key', 1, 0, 100)
@@ -115,13 +115,13 @@ class SpymemcachedPlainProtocolTest < Test::Unit::TestCase
   end
 
   def test_append_string
-    @client['k1'] = 'v'
+    @client.set('k1', 'v', 0, :raw => true)
     assert @client.append('k1', '1')
     assert_equal 'v1', @client['k1']
   end
 
   def test_prepend_string
-    @client['k1'] = 'v'
+    @client.set('k1', 'v', 0, :raw => true)
     assert @client.prepend('k1', '1')
     assert_equal '1v', @client['k1']
   end

data/test/spymemcached_rails23_test.rb

@@ -14,8 +14,8 @@ class SpymemcachedRails23Test < Test::Unit::TestCase
     assert_equal response::DELETED, @client.delete('key')
     assert_equal response::NOT_FOUND, @client.delete('key2')
 
-    @client.set("key1", '0')
-    @client.set("key2", '1')
+    @client.set("key1", '0', 0, :raw => true)
+    @client.set("key2", '1', 0, :raw => true)
     assert_equal({"key1" => '0', 'key2' => '1'}, @client.get_multi('key1', 'key2'))
 
     assert_equal 1, @client.incr('key1', 1, ttl=0)
@@ -25,8 +25,8 @@ class SpymemcachedRails23Test < Test::Unit::TestCase
   end
 
   def test_rails3_api_compatible
-    @client.set("key1", '0')
-    @client.set("key2", '1')
+    @client.set("key1", '0', 0, :raw => true)
+    @client.set("key2", '1', 0, :raw => true)
     assert_equal({"key1" => '0', 'key2' => '1'}, @client.get_multi(['key1', 'key2'], :raw => true))
   end
 

data/test/spymemcached_test.rb

@@ -131,13 +131,14 @@ class SpymemcachedTest < Test::Unit::TestCase
     assert_equal 'v3', @client['key3']
     assert_nil @ns_client['key3']
 
-    @ns_client.append('key2', '4')
-    assert_equal 'v24', @ns_client.get('key2')
+    @ns_client.add('key5', 'v5', 0, :raw => true)
+    @ns_client.append('key5', '4')
+    assert_equal 'v54', @ns_client.get('key5')
 
-    @ns_client.prepend('key2', '4')
-    assert_equal '4v24', @ns_client.get('key2')
+    @ns_client.prepend('key5', '4')
+    assert_equal '4v54', @ns_client.get('key5')
 
-    @ns_client['key2'] = '1'
+    @ns_client.set('key2', '1', 0, :raw => true)
     assert_equal 2, @ns_client.incr('key2')
     assert_equal 1, @ns_client.decr('key2')
 
@@ -201,4 +202,10 @@ class SpymemcachedTest < Test::Unit::TestCase
     assert client.set('key', 'value')
     assert_equal 'value', client.get('key')
   end
+
+  def test_get_set_binary_string_data
+    data = File.read(File.join(File.dirname(__FILE__), "m.png"))
+    @client.add('k', data)
+    assert_equal(data, @client.get('k'))
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spymemcached.jruby
 version: !ruby/object:Gem::Version
-  version: 1.0.10
+  version: 1.0.11
 platform: java
 authors:
 - Xiao Li
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-11-02 00:00:00.000000000 Z
+date: 2014-11-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -71,6 +71,7 @@ files:
 - lib/spymemcached.rb
 - lib/spymemcached_adapter.jar
 - lib/spymemcached/rails23.rb
+- test/m.png
 - test/memcache.rb
 - test/spymemcached_binary_protocol_test.rb
 - test/spymemcached_plain_protocol_test.rb