memcached_store 0.11.2 → 0.11.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 77f6ff3dcde9c204c41292c561764f19b198a552
-  data.tar.gz: 3b784d277f5cf922082e31fc007290db685d846e
+  metadata.gz: 0004cd75061b888d9a2f577b814ebbebb6641e0c
+  data.tar.gz: 1094e612fcbbacea703db393fb4aa1d5188675a8
 SHA512:
-  metadata.gz: eac52dea6f5850280f2ff75f5ee45628af7d9416f90de3bf81f3b6634e8f9af5a7fda438dec36ab3aa9b62f4594733aa8e297e914da1b615e628bbfadd08694a
-  data.tar.gz: 4509b4c17cc097d654abbc461cc24394ca74f338345c379eccf808c7bafa9c184a8df0d9ab7a033d4e3ec48e9de396e4b115dfde03d5e9b07304c697f2242ea2
+  metadata.gz: e9fa84e1fb05038ae55dcb562c65c191f69aa716e9272cf4533414f116865254a7f3f7dd2b781bc68230b6755e6f00d51c6e617c722887728a60c28d24a0f098
+  data.tar.gz: f60ddc1f132a2956d3810b3295c4ed8c07bc8a21b7393e10c59cd0a253d26210d69f3af824d0428047d756910b7d797a1a9984f1b6a515e2b5cb256b49ea14be

data/.travis.yml

@@ -4,7 +4,11 @@ rvm:
   - 1.9.3
   - 2.0.0
   - 2.1.0
+  - 2.1.1
 env:
-  - "AS_VERSION=3.2.16"
-  - "AS_VERSION=4.0.2"
-  - "AS_VERSION=4.1.0.beta1"
+  - "AS_VERSION=3.2.18"
+  - "AS_VERSION=4.0.5"
+  - "AS_VERSION=4.1.0"
+matrix:
+  allow_failures:
+    - env: "AS_VERSION=4.1.0"

data/Gemfile

@@ -3,7 +3,7 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in rails_cache_adapters.gemspec
 gemspec
 
-version = ENV["AS_VERSION"] || "3.2.16"
+version = ENV["AS_VERSION"] || "4.0.5"
 as_version = case version
 when "master"
   {:github => "rails/rails"}
@@ -11,5 +11,5 @@ else
   "~> #{version}"
 end
 
-gem 'minitest', '~> 4.0' if version == "3.2.16"
+gem 'minitest', '~> 4.0' if version == "3.2.18"
 gem "activesupport", as_version

data/README.md

@@ -1,35 +1,51 @@
-# MemcachedSnappyStore
+# ActiveSupport MemcachedStore
 
-ActiveSupport cache store that adds snappy compression at the cost of making the ```incr, decr, add``` operations unavailable. 
+This gem includes two memcached stores.
+
+### MemcachedStore
+
+ActiveSupport memcached store. This wraps the memcached gem into a ActiveSupport::Cache::Store, so it could be used inside Rails.
+
+### MemcachedSnappyStore
+
+ActiveSupport cache store that adds snappy compression at the cost of making the ```incr, decr``` operations unavailable.
 
 ## Installation
 
 Add this line to your application's Gemfile:
 
-    gem 'memcached_store'
+```
+gem 'memcached_store'
+```
 
 And then execute:
 
-    $ bundle
+```bash
+$ bundle
+```
 
 Or install it yourself as:
 
-    $ gem install memcached_store
+```bash
+$ gem install memcached_store
+```
 
 ## Usage
 
 In your environment file:
 
 ```ruby
+# for memcached store
+config.cache_store = :memcached_store,
 
-  config.cache_store = :memcached_snappy_store,  
-    Memcached::Rails.new(:servers => ['memcached1.foo.com', 'memcached2.foo.com']) 
-
+# for snappy store
+config.cache_store = :memcached_snappy_store,
+  Memcached::Rails.new(:servers => ['memcached1.foo.com', 'memcached2.foo.com'])
 ```
 
 ## Code status
 
-[![Build Status](https://travis-ci.org/Shopify/memcached_store.png?branch=accept-list-of-servers-in-options)](https://travis-ci.org/Shopify/memcached_store)
+[![Build Status](https://travis-ci.org/Shopify/memcached_store.svg?branch=master)](https://travis-ci.org/Shopify/memcached_store)
 
 ## Contributing
 

data/lib/active_support/cache/memcached_snappy_store.rb

@@ -1,5 +1,11 @@
+begin
+  require 'snappy'
+rescue LoadError => e
+  $stderr.puts "You don't have snappy installed in your application. Please add `gem \"snappy\"` to your Gemfile and run bundle install"
+  raise e
+end
+
 require 'active_support/cache/memcached_store'
-require 'snappy'
 
 module ActiveSupport
   module Cache
@@ -14,22 +20,11 @@ module ActiveSupport
         raise UnsupportedOperation.new("decrement is not supported by: #{self.class.name}")
       end
 
-      protected
-
-      def write_entry(key, entry, options)
-        # normally unless_exist would make this method use add,  add will not make sense on compressed entries
-        raise UnsupportedOperation.new("unless_exist would try to use the unsupported add method") if options && options[:unless_exist]
-
-        serialized_value = options[:raw] ? entry.value.to_s : Marshal.dump(entry)
-        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
-
-        serialized_compressed_value = Snappy.deflate(serialized_value)
-
-        @data.set(escape_key(key), serialized_compressed_value, expires_in, true)
+      private
+      def serialize_entry(entry, options)
+        value = options[:raw] ? entry.value.to_s : Marshal.dump(entry)
+        options[:raw] = true
+        Snappy.deflate(value)
       end
 
       def deserialize_entry(compressed_value)

data/lib/active_support/cache/memcached_store.rb

@@ -106,12 +106,12 @@ module ActiveSupport
 
         def write_entry(key, entry, options) # :nodoc:
           method = options && options[:unless_exist] ? :add : :set
-          value = options[:raw] ? entry.value.to_s : entry
           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
+          value = serialize_entry(entry, options)
           @data.send(method, escape_key(key), value, expires_in, options[:raw])
         rescue *NONFATAL_EXCEPTIONS => e
           @data.log_exception(e)
@@ -145,6 +145,11 @@ module ActiveSupport
           end
         end
 
+        def serialize_entry(entry, options)
+          entry = entry.value.to_s if options[:raw]
+          entry
+        end
+
     end
   end
 end

data/lib/memcached_store/version.rb

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

data/memcached_store.gemspec

@@ -16,11 +16,11 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
   gem.version       = MemcachedStore::VERSION
   gem.add_runtime_dependency "activesupport", ">=  3.2"
-  gem.add_runtime_dependency "snappy", "0.0.4"
-  gem.add_runtime_dependency "memcached", "~> 1.7.2"
+  gem.add_runtime_dependency "memcached", "~> 1.8.0"
 
   gem.add_development_dependency "rake"
   gem.add_development_dependency "minitest"
   gem.add_development_dependency "mocha"
   gem.add_development_dependency "timecop"
+  gem.add_development_dependency "snappy"
 end

data/test/test_memcached_snappy_store.rb

@@ -19,8 +19,8 @@ class TestMemcachedSnappyStore < ActiveSupport::TestCase
     end
   end
 
-  test "write should not allow  the implicit add operation when unless_exist is passed to write" do
-    assert_raise(ActiveSupport::Cache::MemcachedSnappyStore::UnsupportedOperation) do
+  test "write should allow  the implicit add operation when unless_exist is passed to write" do
+    assert_nothing_raised(ActiveSupport::Cache::MemcachedSnappyStore::UnsupportedOperation) do
       @cache.write('foo', 'bar', :unless_exist => true)
     end
   end

data/test/test_memcached_store.rb

@@ -314,6 +314,15 @@ class TestMemcachedStore < ActiveSupport::TestCase
     assert_equal [21211, 11211], cache.instance_variable_get(:@data).servers.map(&:port)
   end
 
+  def test_namespace_without_servers
+    options = {namespace: 'foo:'}
+    cache = ActiveSupport::Cache.lookup_store(:memcached_store, options)
+    client = cache.instance_variable_get(:@data)
+    assert_equal [11211], client.servers.map(&:port)
+    assert_equal "", client.prefix_key, "should not send the namespace to the client"
+    assert_equal "foo::key", cache.send(:namespaced_key, "key", cache.options)
+  end
+
   private
 
   def expect_not_found

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: memcached_store
 version: !ruby/object:Gem::Version
-  version: 0.11.2
+  version: 0.11.3
 platform: ruby
 authors:
 - Camilo Lopez
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-24 00:00:00.000000000 Z
+date: 2014-05-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -27,35 +27,35 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '3.2'
 - !ruby/object:Gem::Dependency
-  name: snappy
+  name: memcached
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.4
+        version: 1.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.4
+        version: 1.8.0
 - !ruby/object:Gem::Dependency
-  name: memcached
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.7.2
-  type: :runtime
+        version: '0'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.7.2
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -69,7 +69,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: minitest
+  name: mocha
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -83,7 +83,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: mocha
+  name: timecop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -97,7 +97,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: timecop
+  name: snappy
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -154,7 +154,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Plugin-able Memcached adapters to add features (compression, safety)