Skip to content

Commit c33e2d2

Browse files
committed
Remove deprecated support to passing Dalli::Client instances to MemCacheStore
1 parent 21f38d3 commit c33e2d2

File tree

5 files changed

+12
-32
lines changed

5 files changed

+12
-32
lines changed

activesupport/CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
* Remove deprecated support to passing `Dalli::Client` instances to `MemCacheStore`.
2+
3+
*Rafael Mendonça França*
4+
15
* Remove deprecated `config.active_support.use_rfc4122_namespaced_uuids`.
26

37
*Rafael Mendonça França*

activesupport/lib/active_support/cache/mem_cache_store.rb

Lines changed: 6 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,6 @@ def self.build_mem_cache(*addresses) # :nodoc:
7474
#
7575
# If no addresses are provided, but <tt>ENV['MEMCACHE_SERVERS']</tt> is defined, it will be used instead. Otherwise,
7676
# +MemCacheStore+ will connect to localhost:11211 (the default memcached port).
77-
# Passing a +Dalli::Client+ instance is deprecated and will be removed. Please pass an address instead.
7877
def initialize(*addresses)
7978
addresses = addresses.flatten
8079
options = addresses.extract_options!
@@ -86,19 +85,12 @@ def initialize(*addresses)
8685
unless [String, Dalli::Client, NilClass].include?(addresses.first.class)
8786
raise ArgumentError, "First argument must be an empty array, address, or array of addresses."
8887
end
89-
if addresses.first.is_a?(Dalli::Client)
90-
ActiveSupport.deprecator.warn(<<~MSG)
91-
Initializing MemCacheStore with a Dalli::Client is deprecated and will be removed in Rails 7.2.
92-
Use memcached server addresses instead.
93-
MSG
94-
@data = addresses.first
95-
else
96-
@mem_cache_options = options.dup
97-
# The value "compress: false" prevents duplicate compression within Dalli.
98-
@mem_cache_options[:compress] = false
99-
(OVERRIDDEN_OPTIONS - %i(compress)).each { |name| @mem_cache_options.delete(name) }
100-
@data = self.class.build_mem_cache(*(addresses + [@mem_cache_options]))
101-
end
88+
89+
@mem_cache_options = options.dup
90+
# The value "compress: false" prevents duplicate compression within Dalli.
91+
@mem_cache_options[:compress] = false
92+
(OVERRIDDEN_OPTIONS - %i(compress)).each { |name| @mem_cache_options.delete(name) }
93+
@data = self.class.build_mem_cache(*(addresses + [@mem_cache_options]))
10294
end
10395

10496
def inspect

activesupport/test/cache/cache_store_setting_test.rb

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -34,16 +34,6 @@ def test_mem_cache_fragment_cache_store
3434
end
3535
end
3636

37-
def test_mem_cache_fragment_cache_store_with_given_mem_cache
38-
mem_cache = Dalli::Client.new
39-
assert_not_called(Dalli::Client, :new) do
40-
assert_deprecated(ActiveSupport.deprecator) do
41-
store = ActiveSupport::Cache.lookup_store :mem_cache_store, mem_cache
42-
assert_kind_of(ActiveSupport::Cache::MemCacheStore, store)
43-
end
44-
end
45-
end
46-
4737
def test_mem_cache_fragment_cache_store_with_not_dalli_client
4838
assert_not_called(Dalli::Client, :new) do
4939
memcache = Object.new

activesupport/test/cache/stores/mem_cache_store_test.rb

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -297,14 +297,6 @@ def test_unless_exist_expires_when_configured
297297
end
298298
end
299299

300-
def test_uses_provided_dalli_client_if_present
301-
assert_deprecated(ActiveSupport.deprecator) do
302-
host = "custom_host"
303-
cache = lookup_store(Dalli::Client.new(host))
304-
assert_equal [host], servers(cache)
305-
end
306-
end
307-
308300
def test_forwards_string_addresses_if_present
309301
expected_addresses = ["first", "second"]
310302
cache = lookup_store(expected_addresses)

guides/source/7_2_release_notes.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -221,6 +221,8 @@ Please refer to the [Changelog][active-support] for detailed changes.
221221

222222
* Remove deprecated `config.active_support.use_rfc4122_namespaced_uuids`.
223223

224+
* Remove deprecated support to passing `Dalli::Client` instances to `MemCacheStore`.
225+
224226
* Remove deprecated support for the pre-Ruby 2.4 behavior of `to_time` returning a `Time` object with local timezone.
225227

226228
### Deprecations

0 commit comments

Comments
 (0)