zache.rb in zache-0.3.1

- old
+ new

@@ -20,10 +20,12 @@
 # AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
+require 'monitor'
+
 # It is a very simple thread-safe in-memory cache with an ability to expire
 # keys automatically, when their lifetime is over. Use it like this:
 #
 #  require 'zache'
 #  zache = Zache.new
@@ -42,25 +44,19 @@
   # or not (`false`); it is recommended to leave this parameter untouched,
   # unless you really know what you are doing.
   def initialize(sync: true)
     @hash = {}
     @sync = sync
-    @mutex = Mutex.new
+    @monitor = Monitor.new
   end
 
   # Gets the value from the cache by the provided key. If the value is not
   # found in the cache, it will be calculated via the provided block. If
   # the block is not given, an exception will be raised.
   def get(key, lifetime: 60 * 60)
     raise 'A block is required' unless block_given?
-    if @sync
-      @mutex.synchronize do
-        calc(key, lifetime) { yield }
-      end
-    else
-      calc(key, lifetime) { yield }
-    end
+    synchronized { calc(key, lifetime) { yield } }
   end
 
   # Checks whether the value exists in the cache by the provided key. Returns
   # TRUE if the value is here. If the key is already expired in the hash,
   # it will be removed by this method and the result will be FALSE.
@@ -74,31 +70,19 @@
   end
 
   # Removes the value from the hash, by the provied key. If the key is absent
   # and the block is provide, the block will be called.
   def remove(key)
-    if @sync
-      @mutex.synchronize do
-        @hash.delete(key) { yield if block_given? }
-      end
-    else
-      @hash.delete(key) { yield if block_given? }
-    end
+    synchronized { @hash.delete(key) { yield if block_given? } }
   end
 
+  def remove_all
+    synchronized { @hash = {} }
+  end
+
   def clean
-    if @sync
-      @mutex.synchronize do
-        @hash.delete_if do |_key, value|
-          value[:start] < Time.now - value[:lifetime]
-        end
-      end
-    else
-      @hash.delete_if do |_key, value|
-        value[:start] < Time.now - value[:lifetime]
-      end
-    end
+    synchronized { @hash.delete_if { |_key, value| key_expired?(value) } }
   end
 
   private
 
   def calc(key, lifetime)
@@ -110,9 +94,17 @@
         start: Time.now,
         lifetime: lifetime
       }
     end
     @hash[key][:value]
+  end
+
+  def synchronized
+    if @sync
+      @monitor.synchronize { yield }
+    else
+      yield
+    end
   end
 
   def key_expired?(key)
     rec = @hash[key]
     !rec.nil? && rec[:start] < Time.now - rec[:lifetime]