From d311ce434aeee72e95d0158759c45a91410b4e67 Mon Sep 17 00:00:00 2001 From: Mike Ragalie Date: Sun, 1 Apr 2012 13:57:43 -0700 Subject: [PATCH] Cache#_fetch correctly handles cached 'false' --- lib/i18n/backend/cache.rb | 3 ++- test/backend/cache_test.rb | 6 ++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/lib/i18n/backend/cache.rb b/lib/i18n/backend/cache.rb index 67573418..a0292b53 100644 --- a/lib/i18n/backend/cache.rb +++ b/lib/i18n/backend/cache.rb @@ -76,7 +76,8 @@ def fetch(cache_key, &block) end def _fetch(cache_key, &block) - result = I18n.cache_store.read(cache_key) and return result + result = I18n.cache_store.read(cache_key) + return result unless result.nil? result = catch(:exception, &block) I18n.cache_store.write(cache_key, result) unless result.is_a?(Proc) result diff --git a/test/backend/cache_test.rb b/test/backend/cache_test.rb index 39df10d4..de212aab 100644 --- a/test/backend/cache_test.rb +++ b/test/backend/cache_test.rb @@ -36,6 +36,12 @@ def teardown assert_equal 'Bar', I18n.t(:bar) end + test "translate returns a cached false response" do + I18n.backend.expects(:lookup).never + I18n.cache_store.expects(:read).returns(false) + assert_equal false, I18n.t(:foo) + end + test "still raises MissingTranslationData but also caches it" do assert_raise(I18n::MissingTranslationData) { I18n.t(:missing, :raise => true) } assert_raise(I18n::MissingTranslationData) { I18n.t(:missing, :raise => true) }