diff options
| author | Arthur Neves <arthurnn@gmail.com> | 2014-01-03 15:39:33 -0500 |
|---|---|---|
| committer | Arthur Neves <arthurnn@gmail.com> | 2014-01-03 15:39:33 -0500 |
| commit | 98458eea425d15ebadf366d8b55fc89c1913d146 (patch) | |
| tree | d84e6121405db3ed34476febf75cc63b86dc8b7e | |
| parent | f89266ace88b489a6af48fa4ae749a0e159112b6 (diff) | |
| download | rails-98458eea425d15ebadf366d8b55fc89c1913d146.tar.gz rails-98458eea425d15ebadf366d8b55fc89c1913d146.tar.bz2 rails-98458eea425d15ebadf366d8b55fc89c1913d146.zip | |
mem_cache_store requires dalli, so only accept dalli/client
:mem_cache_store require dalli, rescue Dalli exceptions, and follow Dalli API.
Memcached gem, for instance, doesnt work anymore, as the API are different.
As we already require one client, we should make sure that client works, and not accept others, and if someone wants to use another memcache client they can write their own store adapter.
| -rw-r--r-- | activesupport/lib/active_support/cache/mem_cache_store.rb | 7 | ||||
| -rw-r--r-- | activesupport/test/caching_test.rb | 8 |
2 files changed, 1 insertions, 14 deletions
diff --git a/activesupport/lib/active_support/cache/mem_cache_store.rb b/activesupport/lib/active_support/cache/mem_cache_store.rb index 512296554f..1ac4819d47 100644 --- a/activesupport/lib/active_support/cache/mem_cache_store.rb +++ b/activesupport/lib/active_support/cache/mem_cache_store.rb @@ -41,17 +41,12 @@ module ActiveSupport # # If no addresses are specified, then MemCacheStore will connect to # localhost port 11211 (the default memcached port). - # - # Instead of addresses one can pass in a MemCache-like object. For example: - # - # require 'memcached' # gem install memcached; uses C bindings to libmemcached - # ActiveSupport::Cache::MemCacheStore.new(Memcached::Rails.new("localhost:11211")) def initialize(*addresses) addresses = addresses.flatten options = addresses.extract_options! super(options) - if addresses.first.respond_to?(:get) + if addresses.first.is_a?(Dalli::Client) @data = addresses.first else mem_cache_options = options.dup diff --git a/activesupport/test/caching_test.rb b/activesupport/test/caching_test.rb index 51007402a1..09781f3e7a 100644 --- a/activesupport/test/caching_test.rb +++ b/activesupport/test/caching_test.rb @@ -110,14 +110,6 @@ class CacheStoreSettingTest < ActiveSupport::TestCase assert_kind_of(ActiveSupport::Cache::MemCacheStore, store) end - def test_mem_cache_fragment_cache_store_with_given_mem_cache_like_object - Dalli::Client.expects(:new).never - memcache = Object.new - def memcache.get() true end - store = ActiveSupport::Cache.lookup_store :mem_cache_store, memcache - assert_kind_of(ActiveSupport::Cache::MemCacheStore, store) - end - def test_mem_cache_fragment_cache_store_with_multiple_servers Dalli::Client.expects(:new).with(%w[localhost 192.168.1.1], {}) store = ActiveSupport::Cache.lookup_store :mem_cache_store, "localhost", '192.168.1.1' |