Merge pull request #145 from ragalie/cache_false

Cache#_fetch correctly handles cached 'false'
ruby-i18n · Nov 17, 2016 · 14b6a5c · 14b6a5c
2 parents 8e7c228 + d311ce4
commit 14b6a5c
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/lib/i18n/backend/cache.rb b/lib/i18n/backend/cache.rb
@@ -89,7 +89,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
@@ -38,6 +38,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) }