memcached_store 0.12.3 → 0.12.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 563dc926185ce1401b90e4aa920ca2413b528d4b
-  data.tar.gz: 13dba145ab363e3f48af73b57c683a1df769f3ba
+  metadata.gz: 49bdd6128d689edeb751f5144e0e657e52d82d67
+  data.tar.gz: 7b788ed80be35df4cd85784bf4b101f57de3e608
 SHA512:
-  metadata.gz: 5be4ffa5bea1b5b3913dd7e46ada4efdbad576a657fe4ef9ffef106f854bbbe61eba5e984c6f9bbf97928a96fb6074c1f5f45382284adda537bff6e1fbe14519
-  data.tar.gz: a512b4de11d846e161ee61072017152fa5be21f450a11d6f6579df38df480f0bd9cbd30f7064425b0a515bb252659e56fa146fa17eae86629cb215fd6860da8c
+  metadata.gz: dc602ee1dd34fbd99080b5f484a03d73c3a4e241c50438bdd5295fe68d0fa2ef921671a419d8be9d01fccab2f3df80df0f906e2dd0f361679014e2c873cc74ca
+  data.tar.gz: d3fd893033bb1dea5d6e72ee0754694d85918709f739fbbe7ac170fd89d5e7bd533975bf414ed8e17856d184c130bdd81fa827eed5f3dc8d1b8582479ee34542

data/Rakefile

@@ -1,10 +1,10 @@
-#!/usr/bin/env rake
-require 'rake'
+require 'bundler/gem_tasks'
 require 'rake/testtask'
+
 $LOAD_PATH.unshift File.expand_path("../lib", __FILE__)
 require "memcached_store/version"
 
-task :default => 'test'
+task :default => :test
 
 desc 'run test suite with default parser'
 Rake::TestTask.new do |t|
@@ -14,19 +14,8 @@ Rake::TestTask.new do |t|
   t.verbose = true
 end
 
-task :gem => :build
-task :build do
-  system "gem build memcached_store.gemspec"
-end
-
-task :install => :build do
-  system "gem install memcached_store-#{MemcachedStore::VERSION}.gem"
-end
-
-task :release => :build do
+task :tag => :build do
   system "git commit -m'Released version #{MemcachedStore::VERSION}' --allow-empty"
   system "git tag -a v#{MemcachedStore::VERSION} -m 'Tagging #{MemcachedStore::VERSION}'"
   system "git push --tags"
-  system "gem push memcached_store-#{MemcachedStore::VERSION}.gem"
-  system "rm memcached_store-#{MemcachedStore::VERSION}.gem"
 end

data/lib/active_support/cache/memcached_snappy_store.rb

@@ -34,6 +34,10 @@ module ActiveSupport
           nil
         end
       end
+
+      def cas_raw?(options)
+        true
+      end
     end
   end
 end

data/lib/active_support/cache/memcached_store.rb

@@ -71,7 +71,7 @@ module ActiveSupport
         key = namespaced_key(name, options)
 
         instrument(:cas, name, options) do
-          @data.cas(key, expiration(options), options[:raw]) do |raw_value|
+          @data.cas(key, expiration(options), cas_raw?(options)) do |raw_value|
             entry = deserialize_entry(raw_value)
             value = yield entry.value
             serialize_entry(Entry.new(value, options), options)
@@ -88,7 +88,7 @@ module ActiveSupport
         keys_to_names = Hash[names.map{|name| [escape_key(namespaced_key(name, options)), name]}]
 
         instrument(:cas_multi, names, options) do
-          @data.cas(keys_to_names.keys, expiration(options), options[:raw]) do |raw_values|
+          @data.cas(keys_to_names.keys, expiration(options), cas_raw?(options)) do |raw_values|
             values = {}
             raw_values.each do |key, raw_value|
               entry = deserialize_entry(raw_value)
@@ -185,6 +185,10 @@ module ActiveSupport
           entry
         end
 
+        def cas_raw?(options)
+          options[:raw]
+        end
+
         def expiration(options)
           expires_in = options[:expires_in].to_i
           if expires_in > 0 && !options[:raw]

data/lib/memcached_store/version.rb

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

data/test/test_memcached_snappy_store.rb

@@ -3,7 +3,7 @@ require 'test_helper'
 class TestMemcachedSnappyStore < ActiveSupport::TestCase
 
   setup do
-     @cache = ActiveSupport::Cache.lookup_store(:memcached_snappy_store)
+     @cache = ActiveSupport::Cache.lookup_store(:memcached_snappy_store, support_cas: true)
      @cache.clear
   end
 
@@ -98,4 +98,67 @@ class TestMemcachedSnappyStore < ActiveSupport::TestCase
     actual_cache_value = @cache.instance_variable_get(:@data).get(key, true)
     assert_equal 'value', Snappy.inflate(actual_cache_value)
   end
+
+  test "cas should use snappy to read and write cache entries" do
+    entry_value = { :omg => 'data' }
+    update_value = 'value'
+    key = 'ponies'
+
+    @cache.write(key, entry_value)
+    result = @cache.cas(key) do |v|
+      assert_equal entry_value, v
+      update_value
+    end
+    assert result
+    assert_equal update_value, @cache.read(key)
+
+    actual_cache_value = @cache.instance_variable_get(:@data).get(key, true)
+    serialized_entry = Snappy.inflate(actual_cache_value)
+    entry = Marshal.load(serialized_entry)
+    assert entry.is_a?(ActiveSupport::Cache::Entry)
+    assert_equal update_value, entry.value
+  end
+
+  test "cas should support raw entries that don't use marshal format" do
+    key = 'key'
+    @cache.write(key, 'value', :raw => true)
+    result = @cache.cas(key, :raw => true) do |v|
+      assert_equal 'value', v
+      'new_value'
+    end
+    assert result
+    actual_cache_value = @cache.instance_variable_get(:@data).get(key, true)
+    assert_equal 'new_value', Snappy.inflate(actual_cache_value)
+  end
+
+  test "cas_multi should use snappy to read and write cache entries" do
+    keys = %w{ one two three }
+    values = keys.map{ |k| k * 10 }
+    update_hash = {"two" => "two" * 11}
+
+    keys.zip(values) { |k, v| @cache.write(k, v) }
+
+    result = @cache.cas_multi(*keys) do |hash|
+      assert_equal Hash[keys.zip(values)], hash
+      update_hash
+    end
+    assert result
+    assert_equal Hash[keys.zip(values)].merge(update_hash), @cache.read_multi(*keys)
+  end
+
+  test "cas_multi should support raw entries that don't use marshal format" do
+    keys = %w{ one two three }
+    values = keys.map{ |k| k * 10 }
+    update_hash = {"two" => "two" * 11}
+
+    keys.zip(values) { |k, v| @cache.write(k, v) }
+
+    result = @cache.cas_multi(*keys, :raw => true) do |hash|
+      assert_equal Hash[keys.zip(values)], hash
+      update_hash
+    end
+    assert result
+    actual_cache_value = @cache.instance_variable_get(:@data).get("two", true)
+    assert_equal update_hash["two"], Snappy.inflate(actual_cache_value)
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: memcached_store
 version: !ruby/object:Gem::Version
-  version: 0.12.3
+  version: 0.12.5
 platform: ruby
 authors:
 - Camilo Lopez
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-22 00:00:00.000000000 Z
+date: 2014-06-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport