Add test and make it pass

ElMassimo · Jan 20, 2016 · 2e8a50b · 2e8a50b
1 parent c029a53
commit 2e8a50b
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/lib/request_locals.rb b/lib/request_locals.rb
@@ -28,7 +28,7 @@ class << self
   end
 
   # Create cache using reentrant mutex. That's fetch call to be nested.
-  class Cache < Concurrent::Collection::MriMapBackend
+  class RequestCache < Concurrent::Map
     def initialize(options = nil)
       super(options)
       @write_lock = Monitor.new
@@ -39,7 +39,7 @@ def initialize(options = nil)
   def_delegators :store, :[], :[]=, :delete, :empty?
 
   def initialize
-    @cache = Cache.new
+    @cache = RequestCache.new
   end
 
   # Public: Removes all the request-local variables.
@@ -53,7 +53,7 @@ def clear!
   #
   # Returns nothing.
   def clear_all!
-    @cache = Cache.new
+    @cache = RequestCache.new
   end
 
   # Public: Checks if a value was stored for the given key.
@@ -92,6 +92,6 @@ def current_request_id
   # Internal: Returns a new empty structure where the request-local variables
   # will be stored.
   def new_store
-    Cache.new
+    RequestCache.new
   end
 end
diff --git a/test/request_locals_test.rb b/test/request_locals_test.rb
@@ -94,6 +94,11 @@ def test_clear_per_request
     assert_nil global_store[:different_id]
   end
 
+  def test_nested_fetch
+    RequestLocals.clear!
+    assert_equal 2, RequestLocals.store.fetch(:bar) { 1 + RequestLocals.fetch(:foo){ 1 } }
+    assert_equal 2, RequestLocals.store.fetch(:bar) { 1 + RequestLocals.fetch(:foo){ 1 } }
+  end
 private
 
   def global_store