spymemcached.jruby 1.0.0-universal-java-1.7 → 1.0.1-universal-java-1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f2041c63625bc2d15329384c3fcfc124d2c4f3e3
-  data.tar.gz: dd2a6e89826d7fea2d48c802cc60eda42b72463f
+  metadata.gz: bdb378d078ec5deb37b38320e38e1a0961c979a4
+  data.tar.gz: 380044da20a32a1211d5fba6b6aa3b7cf239703f
 SHA512:
-  metadata.gz: 7725d53c5682dcc8b321f7799a33738310425132f60e68e5d9b00af42dacd8d382a5730bd83a5bc921a5b7529733585b4b59471722ccba8c3bec266878cf6898
-  data.tar.gz: fd482a06a00659cfe2f59965695d542c5ee00cb74bb5494dc1027190e00a397ffbf221df3c5f9286d0e64b3eccbdd9e98f7e03c615553cd158e6fe95825aedcd
+  metadata.gz: 5f288aacb5527b67704d0bb07b6c3f28c9bd0cfffba6a66b90eb24f3e6914aa13d3889fb17216a89a9d980a30d0aa413670b6f89cb5ed16c0f7851f0eb43426d
+  data.tar.gz: 95feaed19b2eb5eea91f895b0fd51adaa1b50f185be56b89f6d6d8cf5fc31df069c7eb85a4ec81eebe3a986481f5562290eb7b397645d1a7b2f34a618698f612

data/lib/spymemcached.rb

@@ -32,6 +32,9 @@ class Spymemcached
   def initialize(servers=['localhost:11211'], options={})
     @servers, @options = Array(servers).join(','), DEFAULT_OPTIONS.merge(options)
     @client = SpymemcachedAdapter.new(@servers, @options)
+    @namespace = if @options[:namespace]
+      @options[:namespace].is_a?(Proc) ? @options[:namespace] : lambda { @options[:namespace] }
+    end
     at_exit { shutdown }
   end
 
@@ -124,12 +127,17 @@ class Spymemcached
   end
 
   def ns(key)
-    @options[:namespace] ? "#{@options[:namespace]}:#{key}" : key
+    return key unless namespace
+     "#{namespace.call}:#{key}"
   end
 
   def unns(k)
-    return k unless @options[:namespace]
-    @ns_size ||= @options[:namespace].size + 1
+    return k unless namespace
+    @ns_size ||= namespace.call.size + 1
     k[@ns_size..-1]
   end
+
+  def namespace
+    @namespace
+  end
 end

data/test/spymemcached_test.rb

@@ -8,30 +8,37 @@ class SpymemcachedTest < Test::Unit::TestCase
 
   def test_expiry
     @client.add('add_key1', 'v1', 0)
-    @client.add('add_key2', 'v2', 1)
+    @client.add('add_key2', 'v2', 2)
 
     @client.set('set_key1', 'v1', 0)
-    @client.set('set_key2', 'v2', 1)
+    @client.set('set_key2', 'v2', 2)
 
     @client.fetch('fetch_key1', 0) { 'v1' }
-    @client.fetch('fetch_key2', 1) { 'v2' }
+    @client.fetch('fetch_key2', 2) { 'v2' }
 
     @client.add('cas_key1', 'v0')
     @client.add('cas_key2', 'v0')
     @client.cas('cas_key1', 0) { 'v1' }
-    @client.cas('cas_key2', 1) { 'v2' }
+    @client.cas('cas_key2', 2) { 'v2' }
 
     @client.add('replace_key1', 'v0')
     @client.add('replace_key2', 'v0')
     @client.replace('replace_key1', 'v1', 0)
-    @client.replace('replace_key2', 'v2', 1)
+    @client.replace('replace_key2', 'v2', 2)
 
-    @client.add('touch_key1', 'v1', 1)
+    @client.add('touch_key1', 'v1', 2)
 
-    sleep 0.5
-    @client.touch('touch_key1')
+    sleep 0.1
 
-    sleep 0.7
+    assert_equal 'v2', @client.get('add_key2')
+    assert_equal 'v2', @client.get('set_key2')
+    assert_equal 'v2', @client.get('fetch_key2')
+    assert_equal 'v2', @client.get('cas_key2')
+    assert_equal 'v2', @client.get('replace_key2')
+
+    assert @client.touch('touch_key1')
+
+    sleep 2
     assert_equal 'v1', @client['touch_key1']
 
     assert_equal 'v1', @client.get('add_key1')
@@ -132,6 +139,14 @@ class SpymemcachedTest < Test::Unit::TestCase
     assert_nil @ns_client['key2']
   end
 
+  def test_lambda_as_namespace
+    @ns_client = Spymemcached.new('localhost:11211', :namespace => lambda { 'ns' })
+    @ns_client['key'] = 'value'
+    assert_equal 'value', @client['ns:key']
+
+    assert_equal({'key' => "value"}, @ns_client.get_multi('key'))
+  end
+
   def test_stats
     stats = @client.stats
     assert_equal(Hash, stats.class)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spymemcached.jruby
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: universal-java-1.7
 authors:
 - Xiao Li