libmemcached_store 0.7.0 → 0.7.1

data/lib/active_support/cache/libmemcached_store.rb

@@ -88,7 +88,7 @@ module ActiveSupport
 
       def fetch(key, options = nil, &block)
         if block_given?
-          if options && options[:race_condition_ttl]
+          if options && options[:race_condition_ttl] && options[:expires_in]
             fetch_with_race_condition_ttl(key, options, &block)
           else
             key = expanded_key(key)

data/lib/{version.rb → memcached/version.rb}

@@ -1,3 +1,3 @@
 module LibmemcachedStore
-  VERSION = "0.7.0"
+  VERSION = "0.7.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: libmemcached_store
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.1
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-31 00:00:00.000000000 Z
+date: 2014-06-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: memcached
@@ -82,17 +82,17 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '4.7'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '4.7'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -134,30 +134,11 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
-- BENCHMARKS
-- CHANGELOG.md
-- Gemfile
-- MIT-LICENSE
-- README.md
-- Rakefile
-- gemfiles/rails30.gemfile
-- gemfiles/rails31.gemfile
-- gemfiles/rails32.gemfile
-- gemfiles/rails40.gemfile
 - lib/action_dispatch/session/libmemcached_store.rb
 - lib/active_support/cache/libmemcached_store.rb
 - lib/libmemcached_store.rb
 - lib/memcached/get_with_flags.rb
-- lib/version.rb
-- libmemcached_store.gemspec
-- test/action_dispatch/abstract_unit.rb
-- test/action_dispatch/libmemcached_store_test.rb
-- test/active_support/libmemcached_store_test.rb
-- test/fixtures/session_autoload_test.rb
-- test/profile/benchmark.rb
-- test/test_helper.rb
+- lib/memcached/version.rb
 homepage: http://github.com/ccocchi/libmemcached_store
 licenses: []
 post_install_message: 
@@ -178,14 +159,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.21
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: ActiveSupport 3+ cache store for the C-based libmemcached client
-test_files:
-- test/action_dispatch/abstract_unit.rb
-- test/action_dispatch/libmemcached_store_test.rb
-- test/active_support/libmemcached_store_test.rb
-- test/fixtures/session_autoload_test.rb
-- test/profile/benchmark.rb
-- test/test_helper.rb
+test_files: []

data/.gitignore

@@ -1,4 +0,0 @@
-.DS_Store
-*.swp
-Gemfile.lock
-gemfiles/*.lock

data/.travis.yml

@@ -1,10 +0,0 @@
-language: ruby
-rvm:
-  - 1.9.3
-  - 2.0.0
-gemfile:
-  - gemfiles/rails30.gemfile
-  - gemfiles/rails31.gemfile
-  - gemfiles/rails32.gemfile
-  - gemfiles/rails40.gemfile
-

data/BENCHMARKS

@@ -1,37 +0,0 @@
-Testing with
-ruby 1.9.3p286 (2012-10-12 revision 37165) [x86_64-darwin12.2.0]
-Dalli 2.6.3
-Libmemcached_store 0.6.0
-                                      user     system      total        real
-write:short:dalli                 0.380000   0.040000   0.420000 (  0.422342)
-write:short:libm                  0.040000   0.020000   0.060000 (  0.125838)
-write:long:dalli                  0.370000   0.040000   0.410000 (  0.407400)
-write:long:libm                   0.050000   0.030000   0.080000 (  0.130482)
-write:raw:dalli                   0.330000   0.030000   0.360000 (  0.371981)
-write:raw:libm                    0.050000   0.030000   0.080000 (  0.122899)
-
-read:miss:dalli                   0.310000   0.040000   0.350000 (  0.352729)
-read:miss:libm                    0.080000   0.040000   0.120000 (  0.182143)
-read:miss2:dalli                  0.350000   0.040000   0.390000 (  0.394071)
-read:miss2:libm                   0.090000   0.050000   0.140000 (  0.190611)
-read:exist:dalli                  0.350000   0.040000   0.390000 (  0.391384)
-read:exist:libm                   0.060000   0.040000   0.100000 (  0.161597)
-read:expired:dalli                0.350000   0.040000   0.390000 (  0.399342)
-read:expired:libm                 0.080000   0.050000   0.130000 (  0.175674)
-read:raw:dalli                    0.360000   0.040000   0.400000 (  0.400142)
-read:raw:libm                     0.050000   0.040000   0.090000 (  0.160905)
-
-exist:miss:dalli                  0.310000   0.040000   0.350000 (  0.342454)
-exist:miss:libm                   0.040000   0.030000   0.070000 (  0.141901)
-exist:hit:dalli                   0.320000   0.040000   0.360000 (  0.354205)
-exist:hit:libm                    0.030000   0.020000   0.050000 (  0.107114)
-
-delete:miss:dalli                 0.310000   0.040000   0.350000 (  0.342343)
-delete:miss:libm                  0.060000   0.030000   0.090000 (  0.141960)
-delete:hit:dalli                  0.350000   0.040000   0.390000 (  0.389187)
-delete:hit:libm                   0.050000   0.020000   0.070000 (  0.130604)
-
-increment:dalli                   0.380000   0.050000   0.430000 (  0.422802)
-increment:libm                    0.040000   0.020000   0.060000 (  0.119200)
-decrement:dalli                   0.390000   0.040000   0.430000 (  0.426890)
-decrement:libm                    0.030000   0.030000   0.060000 (  0.118954)

data/CHANGELOG.md

@@ -1,31 +0,0 @@
-# Changelog
-
-## 0.7.0
-  * Add support for memcached 1.7 (grosser)
-  * Test with Rails 4 (grosser)
-  * Add race_condition_ttl option to #fetch (grosser)
-
-## 0.6.2
-  * Add :hit to the #fetch payload
-
-## 0.6.1
- * Subclass Memcached instead of modifying the instance (staugaard)
-
-## 0.6.0
-  * New gem name _libmemcached_store_
-  * Handle Memcached::Error in read_multi (staugaard)
-
-## 0.5.1
-  * Remove warning from latest version of mocha
-  * Make #clear compatible with Rails.cache#clear (grosser)
-
-## 0.5.0
-  * Use Memcached#exist if available (performance improvement ~25%)
-  * Correctly escape bad characters and too long keys
-  * Add benchmarks
-  * Remove the use of ActiveSupport::Entry which was a performance bottleneck #3
-
-## 0.4.0
-  * Optimize read_multi to only make one call to memecached server
-  * Update test suite to reflect Rails' one
-  * Add session store tests

data/Gemfile

@@ -1,7 +0,0 @@
-source "http://rubygems.org"
-
-gemspec
-
-group :test do
-  gem 'dalli'
-end

data/MIT-LICENSE

@@ -1,20 +0,0 @@
-Copyright (c) 2008 37signals
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.md

@@ -1,78 +0,0 @@
-# LibmemcachedStore
-
-An ActiveSupport cache store that uses the C-based libmemcached client through Evan Weaver's Ruby/SWIG wrapper, [memcached](https://github.com/evan/memcached). libmemcached is fast (fastest memcache client for Ruby), lightweight, and supports consistent hashing, non-blocking IO, and graceful server failover.
-
-This cache is designed for Rails 3+ applications.
-
-## Prerequisites
-
-You'll need the memcached gem installed:
-
-```ruby
-gem install memcached
-```
-
-or in your Gemfile
-
-```ruby
-gem 'memcached'
-```
-
-There are no other dependencies.
-
-## Installation
-
-Just add to your Gemfile
-
-```ruby
-gem 'libmemcached_store', '~> 0.6.0'
-```
-
-and you're set.
-
-## Usage
-
-This is a drop-in replacement for the memcache store that ships with Rails. To
-enable, set the `config.cache_store` option to `libmemcached_store`
-in the config for your environment
-
-```ruby
-config.cache_store = :libmemcached_store
-```
-
-If no servers are specified, localhost is assumed. You can specify a list of
-server addresses, either as hostnames or IP addresses, with or without a port
-designation. If no port is given, 11211 is assumed:
-
-```ruby
-config.cache_store = :libmemcached_store, %w(cache-01 cache-02 127.0.0.1:11212)
-```
-
-Standard Rails cache store options can be used
-
-```ruby
-config.cache_store = :libmemcached_store, '127.0.0.1:11211', {:compress => true, :expires_in => 3600}
-```
-
-More advanced options can be passed directly to the client
-
-```ruby
-config.cache_store = :libmemcached_store, '127.0.0.1:11211', {:client => { :binary_protocol => true, :no_block => true }}
-```
-
-You can also use `:libmemcached_store` to store your application sessions
-
-```ruby
-require 'action_dispatch/session/libmemcached_store'
-config.session_store = :libmemcached_store, :namespace => '_session', :expire_after => 1800
-```
-
-## Performance
-
-Used with Rails, __libmemcached_store__ is at least 1.5x faster than __dalli__. See [BENCHMARKS](https://github.com/ccocchi/libmemcached_store/blob/master/BENCHMARKS)
-for details
-
-## Props
-
-Thanks to Brian Aker ([http://tangent.org](http://tangent.org)) for creating libmemcached, and Evan
-Weaver ([http://blog.evanweaver.com](http://blog.evanweaver.com)) for the Ruby wrapper.

data/Rakefile

@@ -1,24 +0,0 @@
-require 'rubygems'
-require 'bundler/setup'
-
-require 'rake'
-require 'rake/testtask'
-require 'rdoc/task'
-
-task :default => :test
-
-Rake::TestTask.new do |t|
-  t.libs << 'test'
-  t.pattern = 'test/**/*_test.rb'
-  t.warning = false
-  t.verbose = true
-end
-
-desc 'Generate documentation for the libmemcached_store plugin.'
-Rake::RDocTask.new(:rdoc) do |rdoc|
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title    = 'LibmemcachedStore'
-  rdoc.options << '--line-numbers' << '--inline-source'
-  rdoc.rdoc_files.include('README')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end

data/gemfiles/rails30.gemfile

@@ -1,7 +0,0 @@
-source "http://rubygems.org"
-
-gem 'activesupport', '~> 3.0.0'
-gem 'actionpack', '~> 3.0.0'
-gem 'mocha'
-
-gemspec :path => '../'

data/gemfiles/rails31.gemfile

@@ -1,7 +0,0 @@
-source "http://rubygems.org"
-
-gem 'activesupport', '~> 3.1.0'
-gem 'actionpack', '~> 3.1.0'
-gem 'mocha'
-
-gemspec :path => '../'

data/gemfiles/rails32.gemfile

@@ -1,7 +0,0 @@
-source "http://rubygems.org"
-
-gem 'activesupport', '~> 3.2.0'
-gem 'actionpack', '~> 3.2.0'
-gem 'mocha'
-
-gemspec :path => '../'

data/gemfiles/rails40.gemfile

@@ -1,7 +0,0 @@
-source "http://rubygems.org"
-
-gem 'activesupport', '~> 4.0.0'
-gem 'actionpack', '~> 4.0.0'
-gem 'mocha'
-
-gemspec :path => '../'

data/libmemcached_store.gemspec

@@ -1,31 +0,0 @@
-# -*- encoding: utf-8 -*-
-$:.push File.expand_path("../lib", __FILE__)
-require "version"
-
-Gem::Specification.new do |s|
-  s.name        = "libmemcached_store"
-  s.version     = LibmemcachedStore::VERSION.dup
-  s.platform    = Gem::Platform::RUBY
-  s.summary     = "ActiveSupport 3+ cache store for the C-based libmemcached client"
-  s.email       = "cocchi.c@gmail.com"
-  s.homepage    = "http://github.com/ccocchi/libmemcached_store"
-  s.description = %q{An ActiveSupport cache store that uses the C-based libmemcached client through
-      Evan Weaver's Ruby/SWIG wrapper, memcached. libmemcached is fast, lightweight,
-      and supports consistent hashing, non-blocking IO, and graceful server failover.}
-  s.authors     = ["Christopher Cocchi-Perrier", "Ben Hutton", "Jeffrey Hardy"]
-
-  s.files         = `git ls-files`.split("\n")
-  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
-  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
-  s.require_paths = ["lib"]
-
-  s.add_dependency("memcached", ">= 0")
-
-  s.add_development_dependency('rack')
-  s.add_development_dependency('rake')
-  s.add_development_dependency('mocha')
-  s.add_development_dependency('minitest', '~> 4.7')
-  s.add_development_dependency('activesupport', '>= 3')
-  s.add_development_dependency('actionpack', '>= 3')
-end
-

data/test/action_dispatch/abstract_unit.rb

@@ -1,51 +0,0 @@
-require 'active_support'
-require 'active_support/core_ext/module/delegation'
-require 'active_support/core_ext/module/attribute_accessors'
-require 'action_controller'
-require 'action_dispatch/routing'
-if ActionPack::VERSION::MAJOR >= 4
-  require 'rack/head'
-else
-  require 'action_dispatch/middleware/head'
-end
-require 'action_dispatch/testing/assertions'
-require 'action_dispatch/testing/test_process'
-require 'action_dispatch/testing/integration'
-
-SharedTestRoutes = ActionDispatch::Routing::RouteSet.new
-
-class RoutedRackApp
-  attr_reader :routes
-
-  def initialize(routes, &blk)
-    @routes = routes
-    @stack = ActionDispatch::MiddlewareStack.new(&blk).build(@routes)
-  end
-
-  def call(env)
-    @stack.call(env)
-  end
-end
-
-class ActionDispatch::IntegrationTest < ActiveSupport::TestCase
-  def self.build_app(routes = nil)
-    RoutedRackApp.new(routes || ActionDispatch::Routing::RouteSet.new) do |middleware|
-      if defined?(ActionDispatch::PublicExceptions)
-        middleware.use "ActionDispatch::ShowExceptions", ActionDispatch::PublicExceptions.new("/dev/null")
-        middleware.use "ActionDispatch::DebugExceptions"
-      else
-        middleware.use "ActionDispatch::ShowExceptions"
-      end
-      middleware.use "ActionDispatch::Callbacks"
-      middleware.use "ActionDispatch::ParamsParser"
-      middleware.use "ActionDispatch::Cookies"
-      middleware.use "ActionDispatch::Flash"
-      if ActionPack::VERSION::MAJOR >= 4
-        middleware.use "Rack::Head"
-      else
-        middleware.use "ActionDispatch::Head"
-      end
-      yield(middleware) if block_given?
-    end
-  end
-end

data/test/action_dispatch/libmemcached_store_test.rb

@@ -1,200 +0,0 @@
-require_relative '../test_helper'
-require File.expand_path('../abstract_unit', __FILE__)
-require 'action_dispatch/session/libmemcached_store'
-
-class LibMemcachedStoreTest < ActionDispatch::IntegrationTest
-  class TestController < ActionController::Base
-    def no_session_access
-      head :ok
-    end
-
-    def set_session_value
-      session[:foo] = "bar"
-      head :ok
-    end
-
-    def set_serialized_session_value
-      session[:foo] = SessionAutoloadTest::Foo.new
-      head :ok
-    end
-
-    def get_session_value
-      render :text => "foo: #{session[:foo].inspect}"
-    end
-
-    def get_session_id
-      render :text => "#{request.session_options[:id]}"
-    end
-
-    def call_reset_session
-      session[:bar]
-      reset_session
-      session[:bar] = "baz"
-      head :ok
-    end
-
-    def self._routes
-      SharedTestRoutes
-    end
-  end
-
-  test "setting and getting session value" do
-    with_test_route_set do
-      get '/set_session_value'
-      assert_response :success
-      assert cookies['_session_id']
-
-      get '/get_session_value'
-      assert_response :success
-      assert_equal 'foo: "bar"', response.body
-    end
-  end
-
-  test "getting nil session value" do
-    with_test_route_set do
-      get '/get_session_value'
-      assert_response :success
-      assert_equal 'foo: nil', response.body
-    end
-  end
-
-  test "getting session value after session reset" do
-    with_test_route_set do
-      get '/set_session_value'
-      assert_response :success
-      assert cookies['_session_id']
-      session_cookie = cookies.send(:hash_for)['_session_id']
-
-      get '/call_reset_session'
-      assert_response :success
-      assert_not_equal [], headers['Set-Cookie']
-
-      cookies << session_cookie # replace our new session_id with our old, pre-reset session_id
-
-      get '/get_session_value'
-      assert_response :success
-      assert_equal 'foo: nil', response.body, "data for this session should have been obliterated from memcached"
-    end
-  end
-
-  test "getting from nonexistent session" do
-    with_test_route_set do
-      get '/get_session_value'
-      assert_response :success
-      assert_equal 'foo: nil', response.body
-      assert_nil cookies['_session_id'], "should only create session on write, not read"
-    end
-  end
-
-  test "setting session value after session reset" do
-    with_test_route_set do
-      get '/set_session_value'
-      assert_response :success
-      assert cookies['_session_id']
-      session_id = cookies['_session_id']
-
-      get '/call_reset_session'
-      assert_response :success
-      assert_not_equal [], headers['Set-Cookie']
-
-      get '/get_session_value'
-      assert_response :success
-      assert_equal 'foo: nil', response.body
-
-      get '/get_session_id'
-      assert_response :success
-      assert_not_equal session_id, response.body
-    end
-  end
-
-  test "getting session id" do
-    with_test_route_set do
-      get '/set_session_value'
-      assert_response :success
-      assert cookies['_session_id']
-      session_id = cookies['_session_id']
-
-      get '/get_session_id'
-      assert_response :success
-      assert_equal session_id, response.body, "should be able to read session id without accessing the session hash"
-    end
-  end
-
-  test "deserializes unloaded class" do
-    with_test_route_set do
-      with_autoload_path "session_autoload_test" do
-        get '/set_serialized_session_value'
-        assert_response :success
-        assert cookies['_session_id']
-      end
-      with_autoload_path "session_autoload_test" do
-        get '/get_session_id'
-        assert_response :success
-      end
-      with_autoload_path "session_autoload_test" do
-        get '/get_session_value'
-        assert_response :success
-        assert_equal 'foo: #<SessionAutoloadTest::Foo bar:"baz">', response.body, "should auto-load unloaded class"
-      end
-    end
-  end
-
-  test "doesnt write session cookie if session id is already exists" do
-    with_test_route_set do
-      get '/set_session_value'
-      assert_response :success
-      assert cookies['_session_id']
-
-      get '/get_session_value'
-      assert_response :success
-      assert_equal nil, headers['Set-Cookie'], "should not resend the cookie again if session_id cookie is already exists"
-    end
-  end
-
-  test "prevents session fixation" do
-    with_test_route_set do
-      get '/get_session_value'
-      assert_response :success
-      assert_equal 'foo: nil', response.body
-      session_id = cookies['_session_id']
-
-      reset!
-
-      get '/set_session_value', :_session_id => session_id
-      assert_response :success
-      assert_not_equal session_id, cookies['_session_id']
-    end
-  end
-
-  private
-
-  def with_test_route_set
-    with_routing do |set|
-      set.draw do
-        get ':action', :to => TestController
-      end
-
-      @app = self.class.build_app(set) do |middleware|
-        middleware.use ActionDispatch::Session::LibmemcachedStore, :key => '_session_id'
-        middleware.delete "ActionDispatch::ShowExceptions"
-      end
-
-      yield
-    end
-  end
-
-  def with_autoload_path(path)
-    path = File.join(File.dirname(__FILE__), "../fixtures", path)
-    if ActiveSupport::Dependencies.autoload_paths.include?(path)
-      yield
-    else
-      begin
-        ActiveSupport::Dependencies.autoload_paths << path
-        yield
-      ensure
-        ActiveSupport::Dependencies.autoload_paths.reject! {|p| p == path}
-        ActiveSupport::Dependencies.clear
-      end
-    end
-  end
-end

data/test/active_support/libmemcached_store_test.rb

@@ -1,388 +0,0 @@
-# encoding: utf-8
-
-require_relative '../test_helper'
-require 'memcached'
-require 'active_support'
-require 'active_support/core_ext/module/aliasing'
-require 'active_support/core_ext/object/duplicable'
-require 'active_support/cache/libmemcached_store'
-
-# Make it easier to get at the underlying cache options during testing.
-ActiveSupport::Cache::LibmemcachedStore.class_eval do
-  def client_options
-    @cache.options
-  end
-end
-
-describe ActiveSupport::Cache::LibmemcachedStore do
-  class MockUser
-    def cache_key
-      'foo'
-    end
-  end
-
-  before do
-    @cache = ActiveSupport::Cache.lookup_store(:libmemcached_store, expires_in: 60)
-    @cache.clear
-    @cache.silence!
-  end
-
-  describe "cache store behavior" do
-    def really_long_keys_test
-      key = "a" * 251
-      assert @cache.write(key, "bar")
-      assert_equal "bar", @cache.read(key)
-      assert_equal "bar", @cache.fetch(key)
-      assert_nil @cache.read("#{key}x")
-      assert_equal({key => "bar"}, @cache.read_multi(key))
-      assert @cache.delete(key)
-      refute @cache.exist?(key)
-      assert @cache.write(key, '2', :raw => true)
-      assert_equal 3, @cache.increment(key)
-      assert_equal 2, @cache.decrement(key)
-    end
-
-    it "fetch_without_cache_miss" do
-      @cache.write('foo', 'bar')
-      @cache.expects(:write_entry).never
-      assert_equal 'bar', @cache.fetch('foo') { 'baz' }
-    end
-
-    it "fetch_with_cache_miss" do
-      @cache.expects(:write_entry).with('foo', 'baz', nil)
-      assert_equal 'baz', @cache.fetch('foo') { 'baz' }
-    end
-
-    it "fetch_with_forced_cache_miss" do
-      @cache.write('foo', 'bar')
-      @cache.expects(:read_entry).never
-      @cache.expects(:write_entry).with('foo', 'baz', force: true)
-      assert_equal 'baz', @cache.fetch('foo', force: true) { 'baz' }
-    end
-
-    it "fetch_with_cached_false" do
-      @cache.write('foo', false)
-      refute @cache.fetch('foo') { raise }
-    end
-
-    it "fetch_with_raw_object" do
-      o = Object.new
-      o.instance_variable_set :@foo, 'bar'
-      assert_equal o, @cache.fetch('foo', raw: true) { o }
-    end
-
-    it "fetch_with_cache_key" do
-      u = MockUser.new
-      @cache.write(u.cache_key, 'bar')
-      assert_equal 'bar', @cache.fetch(u) { raise }
-    end
-
-    it "should_read_and_write_strings" do
-      assert @cache.write('foo', 'bar')
-      assert_equal 'bar', @cache.read('foo')
-    end
-
-    it "should_read_and_write_hash" do
-      assert @cache.write('foo', { a: 'b' })
-      assert_equal({ a: 'b' }, @cache.read('foo'))
-    end
-
-    it "should_read_and_write_integer" do
-      assert @cache.write('foo', 1)
-      assert_equal 1, @cache.read('foo')
-    end
-
-    it "should_read_and_write_nil" do
-      assert @cache.write('foo', nil)
-      assert_equal nil, @cache.read('foo')
-    end
-
-    it "should_read_and_write_false" do
-      assert @cache.write('foo', false)
-      assert_equal false, @cache.read('foo')
-    end
-
-    it "read_and_write_compressed_data" do
-      @cache.write('foo', 'bar', :compress => true, :compress_threshold => 1)
-      assert_equal 'bar', @cache.read('foo')
-    end
-
-    it "write_should_overwrite" do
-      @cache.write('foo', 'bar')
-      @cache.write('foo', 'baz')
-      assert_equal 'baz', @cache.read('foo')
-    end
-
-    it "write_compressed_data" do
-      @cache.write('foo', 'bar', :compress => true, :compress_threshold => 1, :raw => true)
-      assert_equal Zlib::Deflate.deflate('bar'), @cache.instance_variable_get(:@cache).get('foo', false)
-    end
-
-    it "read_miss" do
-      assert_nil @cache.read('foo')
-    end
-
-    it "read_should_return_a_different_object_id_each_time_it_is_called" do
-      @cache.write('foo', 'bar')
-      refute_equal @cache.read('foo').object_id, @cache.read('foo').object_id
-    end
-
-    it "read_multi" do
-      @cache.write('foo', 'bar')
-      @cache.write('fu', 'baz')
-      @cache.write('fud', 'biz')
-      assert_equal({"foo" => "bar", "fu" => "baz"}, @cache.read_multi('foo', 'fu'))
-    end
-
-    it "read_multi_with_array" do
-      @cache.write('foo', 'bar')
-      @cache.write('fu', 'baz')
-      assert_equal({"foo" => "bar", "fu" => "baz"}, @cache.read_multi(['foo', 'fu']))
-    end
-
-    it "read_multi_with_raw" do
-      @cache.write('foo', 'bar', :raw => true)
-      @cache.write('fu', 'baz', :raw => true)
-      assert_equal({"foo" => "bar", "fu" => "baz"}, @cache.read_multi('foo', 'fu'))
-    end
-
-    it "read_multi_with_compress" do
-      @cache.write('foo', 'bar', :compress => true, :compress_threshold => 1)
-      @cache.write('fu', 'baz', :compress => true, :compress_threshold => 1)
-      assert_equal({"foo" => "bar", "fu" => "baz"}, @cache.read_multi('foo', 'fu'))
-    end
-
-    it "cache_key" do
-      o = MockUser.new
-      @cache.write(o, 'bar')
-      assert_equal 'bar', @cache.read('foo')
-    end
-
-    it "param_as_cache_key" do
-      obj = Object.new
-      def obj.to_param
-        'foo'
-      end
-      @cache.write(obj, 'bar')
-      assert_equal 'bar', @cache.read('foo')
-    end
-
-    it "array_as_cache_key" do
-      @cache.write([:fu, 'foo'], 'bar')
-      assert_equal 'bar', @cache.read('fu/foo')
-    end
-
-    it "hash_as_cache_key" do
-      @cache.write({:foo => 1, :fu => 2}, 'bar')
-      assert_equal 'bar', @cache.read('foo=1/fu=2')
-    end
-
-    it "keys_are_case_sensitive" do
-      @cache.write('foo', 'bar')
-      assert_nil @cache.read('FOO')
-    end
-
-    it "keys_with_spaces" do
-      assert_equal 'baz', @cache.fetch('foo bar') { 'baz' }
-    end
-
-    it "exist" do
-      @cache.write('foo', 'bar')
-      assert @cache.exist?('foo')
-      refute @cache.exist?('bar')
-    end
-
-    it "delete" do
-      @cache.write('foo', 'bar')
-      assert @cache.exist?('foo')
-      assert @cache.delete('foo')
-      refute @cache.exist?('foo')
-    end
-
-    it "delete_with_unexistent_key" do
-      @cache.expects(:log_error).never
-      refute @cache.exist?('foo')
-      refute @cache.delete('foo')
-    end
-
-    it "store_objects_should_be_immutable" do
-      @cache.write('foo', 'bar')
-      @cache.read('foo').gsub!(/.*/, 'baz')
-      assert_equal 'bar', @cache.read('foo')
-    end
-
-    it "original_store_objects_should_not_be_immutable" do
-      bar = 'bar'
-      @cache.write('foo', bar)
-      assert_equal 'baz', bar.gsub!(/r/, 'z')
-    end
-
-    it "crazy_key_characters" do
-      crazy_key = "#/:*(<+=> )&$%@?;'\"\'`~-"
-      assert @cache.write(crazy_key, "1", :raw => true)
-      assert_equal "1", @cache.read(crazy_key)
-      assert_equal "1", @cache.fetch(crazy_key)
-      assert @cache.delete(crazy_key)
-      refute @cache.exist?(crazy_key)
-      assert_equal "2", @cache.fetch(crazy_key, :raw => true) { "2" }
-      assert_equal 3, @cache.increment(crazy_key)
-      assert_equal 2, @cache.decrement(crazy_key)
-    end
-
-    it "really_long_keys" do
-      really_long_keys_test
-    end
-
-    it "really_long_keys_with_namespace" do
-      @cache = ActiveSupport::Cache.lookup_store(:libmemcached_store, :expires_in => 60, :namespace => 'namespace')
-      @cache.silence!
-      really_long_keys_test
-    end
-
-    it "clear" do
-      @cache.write("foo", "bar")
-      @cache.clear
-      assert_nil @cache.read("foo")
-    end
-
-    it "clear_with_options" do
-      @cache.write("foo", "bar")
-      @cache.clear(:some_option => true)
-      assert_nil @cache.read("foo")
-    end
-  end
-
-  describe "compression" do
-    it "read_and_write_compressed_small_data" do
-      @cache.write('foo', 'bar', :compress => true)
-      raw_value = @cache.send(:read_entry, 'foo', {})
-      assert_equal 'bar', @cache.read('foo')
-      value = Marshal.load(raw_value) rescue raw_value
-      assert_equal 'bar', value
-    end
-
-    it "read_and_write_compressed_large_data" do
-      @cache.write('foo', 'bar', :compress => true, :compress_threshold => 2)
-      raw_value = @cache.send(:read_entry, 'foo', :raw => true)
-      assert_equal 'bar', @cache.read('foo')
-      assert_equal 'bar', Marshal.load(raw_value)
-    end
-  end
-
-  describe "increment / decrement" do
-    it "increment" do
-      @cache.write('foo', '1', :raw => true)
-      assert_equal 1, @cache.read('foo').to_i
-      assert_equal 2, @cache.increment('foo')
-      assert_equal 2, @cache.read('foo').to_i
-      assert_equal 3, @cache.increment('foo')
-      assert_equal 3, @cache.read('foo').to_i
-    end
-
-    it "decrement" do
-      @cache.write('foo', '3', :raw => true)
-      assert_equal 3, @cache.read('foo').to_i
-      assert_equal 2, @cache.decrement('foo')
-      assert_equal 2, @cache.read('foo').to_i
-      assert_equal 1, @cache.decrement('foo')
-      assert_equal 1, @cache.read('foo').to_i
-    end
-
-    it "increment_decrement_non_existing_keys" do
-      @cache.expects(:log_error).never
-      assert_nil @cache.increment('foo')
-      assert_nil @cache.decrement('bar')
-    end
-  end
-
-  it "should_identify_cache_store" do
-    assert_kind_of ActiveSupport::Cache::LibmemcachedStore, @cache
-  end
-
-  it "should_set_server_addresses_to_nil_if_none_are_given" do
-    assert_equal [], @cache.addresses
-  end
-
-  it "should_set_custom_server_addresses" do
-    store = ActiveSupport::Cache.lookup_store :libmemcached_store, 'localhost', '192.168.1.1'
-    assert_equal %w(localhost 192.168.1.1), store.addresses
-  end
-
-  it "should_enable_consistent_ketema_hashing_by_default" do
-    assert_equal :consistent_ketama, @cache.client_options[:distribution]
-  end
-
-  it "should_not_enable_non_blocking_io_by_default" do
-    assert_equal false, @cache.client_options[:no_block]
-  end
-
-  it "should_not_enable_server_failover_by_default" do
-    assert_nil @cache.client_options[:failover]
-  end
-
-  it "should_allow_configuration_of_custom_options" do
-    options = { client: { tcp_nodelay: true, distribution: :modula } }
-
-    store = ActiveSupport::Cache.lookup_store :libmemcached_store, 'localhost', options
-
-    assert_equal :modula, store.client_options[:distribution]
-    assert_equal true, store.client_options[:tcp_nodelay]
-  end
-
-  it "should_allow_mute_and_silence" do
-    cache = ActiveSupport::Cache.lookup_store :libmemcached_store, 'localhost'
-    cache.mute do
-      assert cache.write('foo', 'bar')
-      assert_equal 'bar', cache.read('foo')
-    end
-    refute cache.silence?
-    cache.silence!
-    assert cache.silence?
-  end
-
-  describe "#fetch with :race_condition_ttl" do
-    let(:options) { {:expires_in => 1, :race_condition_ttl => 5} }
-
-    def fetch(&block)
-      @cache.fetch("unknown", options, &block)
-    end
-
-    after do
-      Thread.list.each { |t| t.exit unless t == Thread.current }
-    end
-
-    it "works like a normal fetch" do
-      fetch { 1 }.must_equal 1
-    end
-
-    it "keeps a cached value even if the cache expires" do
-      fetch { 1 } # fill it
-
-      future = Time.now + 3 * 60
-      Time.stubs(:now).returns future
-
-      Thread.new do
-        sleep 0.1
-        fetch { raise }.must_equal 1 # 3rd fetch -> read expired value
-      end
-      fetch { sleep 0.2; 2 }.must_equal 2 # 2nd fetch -> takes time to generate but returns correct value
-      fetch { 3 }.must_equal 2 # 4th fetch still correct value
-    end
-
-    it "can be read by a normal read" do
-      fetch { 1 }
-      @cache.read("unknown").must_equal 1
-    end
-
-    it "can be read by a normal fetch" do
-      fetch { 1 }
-      @cache.fetch("unknown") { 2 }.must_equal 1
-    end
-
-    it "can write to things that get fetched" do
-      fetch { 1 }
-      @cache.write "unknown", 2
-      fetch { 1 }.must_equal 2
-    end
-  end
-end

data/test/fixtures/session_autoload_test.rb

@@ -1,10 +0,0 @@
-module SessionAutoloadTest
-  class Foo
-    def initialize(bar='baz')
-      @bar = bar
-    end
-    def inspect
-      "#<#{self.class} bar:#{@bar.inspect}>"
-    end
-  end
-end

data/test/profile/benchmark.rb

@@ -1,94 +0,0 @@
-require 'benchmark'
-require 'active_support'
-
-require 'libmemcached_store'
-require 'active_support/cache/libmemcached_store'
-
-require 'dalli'
-require 'active_support/cache/dalli_store'
-
-puts "Testing with"
-puts RUBY_DESCRIPTION
-puts "Dalli #{Dalli::VERSION}"
-puts "Libmemcached_store #{LibmemcachedStore::VERSION}"
-
-# We'll use a simple @value to try to avoid spending time in Marshal,
-# which is a constant penalty that both clients have to pay
-@value = []
-@marshalled = Marshal.dump(@value)
-
-@servers = ['127.0.0.1:11211']
-@key1 = "Short"
-@key2 = "Sym1-2-3::45"*4
-@key3 = "Long"*40
-@key4 = "Medium"*8
-
-N = 2_500
-
-@dalli = ActiveSupport::Cache::DalliStore.new(@servers).silence!
-@libm = ActiveSupport::Cache::LibmemcachedStore.new(@servers).silence!
-
-def clear
-  @dalli.clear
-  @libm.clear
-end
-
-def test_method(title, method_name, key, *arguments)
-  { dalli: @dalli, libm: @libm }.each do |name, store|
-    @job.report("#{title}:#{name}") { N.times { store.send(method_name, key, *arguments) } }
-  end
-end
-
-def run_method(method_name, key, *arguments)
-  [@dalli, @libm].each do |store|
-    store.send(method_name, key, *arguments)
-  end
-end
-
-Benchmark.bm(31) do |x|
-  @job = x
-
-  test_method('write:short', :write, @key1, @value)
-  test_method('write:long',  :write, @key3, @value)
-  test_method('write:raw',   :write, @key4, @value, raw: true)
-
-  puts
-  clear
-
-  test_method('read:miss',  :read, @key1)
-  test_method('read:miss2', :read, @key1)
-
-  run_method(:write, @key4, @value)
-  test_method('read:exist', :read, @key4)
-
-  run_method(:write, @key4, @value, expires_in: 1)
-  sleep(1)
-  test_method('read:expired', :read, @key2)
-
-  run_method(:write, @key3, @value, raw: true)
-  test_method('read:raw', :read, @key3, raw: true)
-
-  puts
-  clear
-
-  test_method('exist:miss', :exist?, @key4)
-
-  run_method(:write, @key4, @value)
-  test_method('exist:hit', :exist?, @key4)
-
-  puts
-  clear
-
-  test_method('delete:miss', :delete, @key4)
-
-  run_method(:write, @key1, @value)
-  test_method('delete:hit', :delete, @key1)
-
-  puts
-  clear
-
-  run_method(:write, @key4, 0, raw: true)
-
-  test_method('increment', :increment, @key4)
-  test_method('decrement', :decrement, @key4)
-end

data/test/test_helper.rb

@@ -1,6 +0,0 @@
-ENV["RAILS_ENV"] = "test"
-$LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
-
-require 'minitest/autorun'
-require 'minitest/spec'
-require 'mocha/setup'