memcached_store 0.11.3 → 0.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0004cd75061b888d9a2f577b814ebbebb6641e0c
-  data.tar.gz: 1094e612fcbbacea703db393fb4aa1d5188675a8
+  metadata.gz: 171a18683c77797d79f6c336d29904a50120607b
+  data.tar.gz: 3b2dc285bb4064f3b73dd620174934527a03cf5a
 SHA512:
-  metadata.gz: e9fa84e1fb05038ae55dcb562c65c191f69aa716e9272cf4533414f116865254a7f3f7dd2b781bc68230b6755e6f00d51c6e617c722887728a60c28d24a0f098
-  data.tar.gz: f60ddc1f132a2956d3810b3295c4ed8c07bc8a21b7393e10c59cd0a253d26210d69f3af824d0428047d756910b7d797a1a9984f1b6a515e2b5cb256b49ea14be
+  metadata.gz: 52711d0a3a25db301f523fb90b097392d653965876d93d24e80cedc542526b345f825a1e61a32d116a94a963024aebdf36264a076712f64841977836138cc467
+  data.tar.gz: d6dbb652bc7fc0b58ee187ca023e512723daa77095aa8333f78af6dc14345d8f120250d0fd88801763555cb2582aa05429f08bb7b1b4ac886dee04d0f2d5d013

data/lib/active_support/cache/memcached_store.rb

@@ -64,6 +64,41 @@ module ActiveSupport
         {}
       end
 
+      def cas(name, options = nil)
+        options = merged_options(options)
+        options.merge!(:raw => true)
+        key = namespaced_key(name, options)
+
+        @data.cas(key, expiration(options), true) do |raw_value|
+          entry = deserialize_entry(raw_value)
+          value = yield entry.value
+          serialize_entry(Entry.new(value, options), options)
+        end
+      rescue *NONFATAL_EXCEPTIONS => e
+        @data.log_exception(e)
+        false
+      end
+
+      def cas_multi(*names)
+        options = names.extract_options!
+        options = merged_options(options)
+        options.merge!(:raw => true)
+        keys_to_names = Hash[names.map{|name| [escape_key(namespaced_key(name, options)), name]}]
+
+        @data.cas(keys_to_names.keys, expiration(options), true) do |raw_values|
+          values = {}
+          raw_values.each do |key, raw_value|
+            entry = deserialize_entry(raw_value)
+            values[keys_to_names[key]] = entry.value unless entry.expired?
+          end
+          values = yield values
+          Hash[values.map{|name, value| [escape_key(namespaced_key(name, options)), serialize_entry(Entry.new(value, options), options)]}]
+        end
+      rescue *NONFATAL_EXCEPTIONS => e
+        @data.log_exception(e)
+        false
+      end
+
       def increment(name, amount = 1, options = nil) # :nodoc:
         options = merged_options(options)
         instrument(:increment, name, :amount => amount) do
@@ -106,11 +141,7 @@ module ActiveSupport
 
         def write_entry(key, entry, options) # :nodoc:
           method = options && options[:unless_exist] ? :add : :set
-          expires_in = options[:expires_in].to_i
-          if expires_in > 0 && !options[:raw]
-            # Set the memcache expire a few minutes in the future to support race condition ttls on read
-            expires_in += 5.minutes
-          end
+          expires_in = expiration(options)
           value = serialize_entry(entry, options)
           @data.send(method, escape_key(key), value, expires_in, options[:raw])
         rescue *NONFATAL_EXCEPTIONS => e
@@ -150,6 +181,15 @@ module ActiveSupport
           entry
         end
 
+        def expiration(options)
+          expires_in = options[:expires_in].to_i
+          if expires_in > 0 && !options[:raw]
+            # Set the memcache expire a few minutes in the future to support race condition ttls on read
+            expires_in += 5.minutes
+          end
+          expires_in
+        end
+
     end
   end
 end

data/lib/memcached_store/version.rb

@@ -1,4 +1,4 @@
 # encoding: utf-8
 module MemcachedStore
-  VERSION = "0.11.3"
+  VERSION = "0.12.0"
 end

data/memcached_store.gemspec

@@ -4,8 +4,8 @@ $:.unshift lib unless $:.include?(lib)
 require "memcached_store/version"
 
 Gem::Specification.new do |gem|
-  gem.authors       = ["Camilo Lopez", "Tom Burns", "Arthur Neves"]
-  gem.email         = ["camilo@camilolopez.com", "tom.burns@shopify.com", "arthurnn@gmail.com"]
+  gem.authors       = ["Camilo Lopez", "Tom Burns", "Arthur Neves", "Francis Bogsanyi"]
+  gem.email         = ["camilo@camilolopez.com", "tom.burns@shopify.com", "arthurnn@gmail.com", "francis.bogsanyi@shopify.com"]
   gem.summary = gem.description   = %q{Plugin-able Memcached adapters to add features (compression, safety)}
   gem.homepage      = "https://github.com/Shopify/memcached_store/"
 

data/test/test_memcached_store.rb

@@ -2,7 +2,7 @@ require 'test_helper'
 
 class TestMemcachedStore < ActiveSupport::TestCase
   setup do
-    @cache = ActiveSupport::Cache.lookup_store(:memcached_store, expires_in: 60)
+    @cache = ActiveSupport::Cache.lookup_store(:memcached_store, expires_in: 60, support_cas: true)
     @cache.clear
   end
 
@@ -51,6 +51,72 @@ class TestMemcachedStore < ActiveSupport::TestCase
     assert_nil @cache.fetch('foo') { 'baz' }
   end
 
+  def test_cas
+    @cache.write('foo', nil)
+    assert @cache.cas('foo') {|value| assert_nil value; 'bar' }
+    assert_equal 'bar', @cache.read('foo')
+  end
+
+  def test_cas_with_cache_miss
+    refute @cache.cas('not_exist') {|value| flunk }
+  end
+
+  def test_cas_with_conflict
+    @cache.write('foo', 'bar')
+    refute @cache.cas('foo') {|value|
+      @cache.write('foo', 'baz')
+      'biz'
+    }
+    assert_equal 'baz', @cache.read('foo')
+  end
+
+  def test_cas_multi_with_empty_set
+    refute @cache.cas_multi() {|hash| flunk }
+  end
+
+  def test_cas_multi
+    @cache.write('foo', 'bar')
+    @cache.write('fud', 'biz')
+    assert @cache.cas_multi('foo', 'fud') {|hash| assert_equal({"foo" => "bar", "fud" => "biz"}, hash); {"foo" => "baz", "fud" => "buz"} }
+    assert_equal({"foo" => "baz", "fud" => "buz"}, @cache.read_multi('foo', 'fud'))
+  end
+
+  def test_cas_multi_with_altered_key
+    @cache.write('foo', 'baz')
+    assert @cache.cas_multi('foo') {|hash| {'fu' => 'baz'}}
+    assert_nil @cache.read('fu')
+    assert_equal 'baz', @cache.read('foo')
+  end
+
+  def test_cas_multi_with_cache_miss
+    assert @cache.cas_multi('not_exist') {|hash| assert hash.empty?; {} }
+  end
+
+  def test_cas_multi_with_partial_miss
+    @cache.write('foo', 'baz')
+    assert @cache.cas_multi('foo', 'bar') {|hash| assert_equal({"foo" => "baz"}, hash); {} }
+    assert_equal 'baz', @cache.read('foo')
+  end
+
+  def test_cas_multi_with_partial_update
+    @cache.write('foo', 'bar')
+    @cache.write('fud', 'biz')
+    assert @cache.cas_multi('foo', 'fud') {|hash| assert_equal({"foo" => "bar", "fud" => "biz"}, hash); {"foo" => "baz"} }
+    assert_equal({"foo" => "baz", "fud" => "biz"}, @cache.read_multi('foo', 'fud'))
+  end
+
+  def test_cas_multi_with_partial_conflict
+    @cache.write('foo', 'bar')
+    @cache.write('fud', 'biz')
+    result = @cache.cas_multi('foo', 'fud') do |hash|
+      assert_equal({"foo" => "bar", "fud" => "biz"}, hash)
+      @cache.write('foo', 'bad')
+      {"foo" => "baz", "fud" => "buz"}
+    end
+    assert result
+    assert_equal({"foo" => "bad", "fud" => "buz"}, @cache.read_multi('foo', 'fud'))
+  end
+
   def test_should_read_and_write_hash
     assert @cache.write('foo', {:a => "b"})
     assert_equal({:a => "b"}, @cache.read('foo'))

metadata

@@ -1,16 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: memcached_store
 version: !ruby/object:Gem::Version
-  version: 0.11.3
+  version: 0.12.0
 platform: ruby
 authors:
 - Camilo Lopez
 - Tom Burns
 - Arthur Neves
+- Francis Bogsanyi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-08 00:00:00.000000000 Z
+date: 2014-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -115,6 +116,7 @@ email:
 - camilo@camilolopez.com
 - tom.burns@shopify.com
 - arthurnn@gmail.com
+- francis.bogsanyi@shopify.com
 executables: []
 extensions: []
 extra_rdoc_files: []