diff --git a/activesupport/CHANGELOG.md b/activesupport/CHANGELOG.md
index b2ab5ffcbe2a02354c812a9eeded1c895d3945f4..690314b59a25ce14933de789f2b1e2506bccdf45 100644
--- a/activesupport/CHANGELOG.md
+++ b/activesupport/CHANGELOG.md
@@ -1,3 +1,10 @@
+* Raise an argument error if no block is passed to #fetch with option
+ `force: true` is set.
+
+ cache.fetch('today', force: true) # => ArgumentError: Missing block
+
+ *Santosh Wadghule*
+
* `ActiveSupport::Duration` supports weeks and hours.
[1.hour.inspect, 1.hour.value, 1.hour.parts]
diff --git a/activesupport/lib/active_support/cache.rb b/activesupport/lib/active_support/cache.rb
index 85f462a1b19c6aad2ece82c896e210ef2960ebdd..f27bac3dca4047a90c107cee004c663b6156608c 100644
--- a/activesupport/lib/active_support/cache.rb
+++ b/activesupport/lib/active_support/cache.rb
@@ -198,10 +198,16 @@ def mute
# cache.fetch('city') # => "Duckburgh"
#
# You may also specify additional options via the +options+ argument.
- # Setting force: true will force a cache miss:
+ # Setting force: true will force a cache miss and return value of
+ # the block will be written to the cache under the given cache key.
#
# cache.write('today', 'Monday')
- # cache.fetch('today', force: true) # => nil
+ # cache.fetch('today', force: true) { 'Tuesday' } # => 'Tuesday'
+ #
+ # It will raise an argument error if no block is passed to #fetch with
+ # option force: true is set.
+ #
+ # cache.fetch('today', force: true) # => ArgumentError: Missing block
#
# Setting :compress will store a large cache entry set by the call
# in a compressed format.
@@ -292,6 +298,8 @@ def fetch(name, options = nil)
else
save_block_result_to_cache(name, options) { |_name| yield _name }
end
+ elsif options && options[:force]
+ raise ArgumentError, 'Missing block'
else
read(name, options)
end
diff --git a/activesupport/test/caching_test.rb b/activesupport/test/caching_test.rb
index 9e744afb2b6efc4baf8bdc40cb58f5ec190a23f0..032367e10d39a257abd3fd6551a1b2df98f9b952 100644
--- a/activesupport/test/caching_test.rb
+++ b/activesupport/test/caching_test.rb
@@ -266,6 +266,20 @@ def test_fetch_with_cached_nil
end
end
+ def test_fetch_with_forced_cache_miss_with_block
+ @cache.write('foo', 'bar')
+ assert_equal 'foo_bar', @cache.fetch('foo', force: true) { 'foo_bar' }
+ end
+
+ def test_fetch_with_forced_cache_miss_without_block
+ @cache.write('foo', 'bar')
+ assert_raises(ArgumentError, 'Missing block') do
+ @cache.fetch('foo', force: true)
+ end
+
+ assert_equal 'bar', @cache.read('foo')
+ end
+
def test_should_read_and_write_hash
assert @cache.write('foo', {:a => "b"})
assert_equal({:a => "b"}, @cache.read('foo'))