libcache 0.3 → 0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1745f8dfa5166c285d38f5a9303350590e1aae2f
-  data.tar.gz: e54f0dabd6ac9874078e89494d3ff32a3b79e53a
+  metadata.gz: e8612eef2a81c246498e1754292a22ae0f4dbda6
+  data.tar.gz: 7cc008ff91ef841e8a98d9a9113616f31047aca4
 SHA512:
-  metadata.gz: a0bd90c60a77bfed598db5f7a707fb15fa9c06cf290d320fa44b6a2d7025fba30cfd87bddb65ed92ada94b95c1147872321da4f52f8029a13b63123dffd29a69
-  data.tar.gz: e065672af43bb05078e505a1469ec6c440edee36650156d7718c9d4a4d54c995322de8e657830bb6010f6659913dffbfae5ae8a658dc430f561e612427bf7dce
+  metadata.gz: c79778ceb2c0c8e2ef1c29df41e6cf1ec9941d09624f0a884eb70c81d3dea2ebd039d4f271197b22d1fab71628f7221ce9f58d27c2f915e04f5e436440a4a038
+  data.tar.gz: 1b0d07b38f7926a47dffa619ea2232d4f7c87a5146d16d101fe533477e91cb0457d7f2aefcbed57724dbdf47e149c8732bbfd7e1e9136bc56d977445ae254505

data/README.md

@@ -1,6 +1,6 @@
 # Libcache [![Build Status](https://travis-ci.org/silk8192/libcache.svg?branch=master)](https://travis-ci.org/silk8192/libcache) [![Gem Version](https://badge.fury.io/rb/libcache.svg)](https://badge.fury.io/rb/libcache)
 
-A simple caching library that provides flexible and powerful caching features such as in-memory and file based caching similar to Guava's Caching system.
+A simple caching library that provides flexible and powerful caching features such as in-memory and file based caching similar to Guava's Caching system. [Docs.](http://www.rubydoc.info/gems/libcache)
 
 ## Features
 
@@ -11,7 +11,6 @@ A simple caching library that provides flexible and powerful caching features su
 * Allows custom refresh functions for reloading expensive data once it has been discarded 
 
 
-
 ## Installation
 
 Add this line to your application's Gemfile:
@@ -43,7 +42,7 @@ cache.exists?(1) # will return true. if there is no set_refresh method provided
 
 # delete all data on exit of program
 at_exit do
-  cache.invalidateAll
+  cache.invalidate_all
 end
 
 ```
@@ -61,7 +60,7 @@ cache.exists?(1) # will return true. if there is no set_refresh method provided
 
 # delete all leftover files on exit of program
 at_exit do
-  cache.invalidateAll
+  cache.invalidate_all
 end
 ```
 

data/lib/libcache/cache.rb

@@ -21,21 +21,28 @@ class Cache
   # @param [String] key The key value used to identify an object in the cache
   # @param [Object] value The object to be placed in the cache
   def put(key, value)
-    # removed oldest entry if max_size is approached
-    if max_size != nil
-      if @cache.size >= max_size - 1
-        key, value = @time_tracker.values.sort {|v| Time.now - v }.reverse.first
-        invalidate(key)
-        @time_tracker.delete(key)
-      end
-      @time_tracker[key] = Time.now
-    end
     @cache[key] = value
     if expiry_time != nil
       @scheduler.in expiry_time, :blocking => true do
         invalidate key
       end
     end
+    check_expiration(key)
+  end
+
+  private def check_expiration(key)
+    # removed oldest entry if max_size is approached
+    @time_tracker[key] = Time.now
+    if max_size != nil
+      if get_size >= max_size
+        n = get_size - max_size
+        keys = @time_tracker.sort_by{|k,v| Time.now - v }.reverse.first n
+        keys.each do |keyz, valuez|
+          invalidate(keyz)
+          @time_tracker.delete(keyz)
+        end
+      end
+    end
   end
 
   # Gets the object that corresponds with the key
@@ -43,6 +50,9 @@ class Cache
   # @return [Object] The object that corresponds with the key
   def get(key)
     check_refresh(key)
+    if(@cache[key]) == nil
+      return nil
+    end
     return @cache[key]
   end
 
@@ -70,7 +80,7 @@ class Cache
   end
 
   def get_size
-    return @cache.size
+    return @cache.length
   end
 
   # Deletes a key-value pair from the cache
@@ -80,7 +90,7 @@ class Cache
   end
 
   # Clears all items in the cache
-  def invalidateAll
+  def invalidate_all
     @cache.clear
   end
 

data/lib/libcache/file_cache.rb

@@ -23,42 +23,40 @@ class FileCache < Cache
   def put(key, value)
     raise InvalidKey unless key.is_a? String
     raise InvalidKey unless key =~ /\A[a-zA-Z0-9_-]+\z/
-    if max_size != nil
-      if @cache.size >= max_size - 1
-        key, value = @time_tracker.values.sort {|v| Time.now - v }.reverse.first
-        invalidate(key)
-        @time_tracker.delete(key)
-      end
-      @time_tracker[key] = Time.now
-    end
-    @keys[key] = Digest::MD5.hexdigest(key) + Time.now.to_i.to_s
-    @cache[key] = value
+    @keys[key] = @keys.size.to_s
     File.open(File.join(store, @keys[key]), 'w') do |f|
-      f.write(value)
+      f.write(Marshal.dump(value))
     end
-    @scheduler.in expiry_time, :blocking => true do
-      invalidate key
+    @cache[key] = value
+    if expiry_time != nil
+      @scheduler.in expiry_time, :blocking => true do
+        invalidate key
+      end
     end
+    check_expiration(key)
   end
 
   # Gets the object that corresponds with the key that is read from the filesystem
   # @param [String] key The key value used to identify an object in the cache
   # @return [Object] The object that corresponds with the key
   def get(key)
-    refresh
-    return File.read(File.join(store, @keys[key]))
+    check_refresh(key)
+    if(@keys[key]) == nil
+      return nil
+    end
+    return Marshal.load(File.read(File.join(store, @keys[key])))
   end
 
   # Deletes a key-value pair from the cache and store directory
   # @param [String] key The key value used to identify an object in the cache
   def invalidate(key)
     super
-    @keys.delete key
     File.delete(File.join(store, @keys[key]))
+    @keys.delete key
   end
 
   # Clears all items in the cache and the cached files in the store directory
-  def invalidateAll
+  def invalidate_all
     super
     Dir.foreach(store) do |f|
       File.delete(File.join(store, f)) if f != '.' && f != '..'

data/lib/libcache/version.rb

@@ -1,3 +1,3 @@
 module Libcache
-  VERSION = "0.3"
+  VERSION = "0.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: libcache
 version: !ruby/object:Gem::Version
-  version: '0.3'
+  version: '0.4'
 platform: ruby
 authors:
 - silk8192
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-01-15 00:00:00.000000000 Z
+date: 2017-01-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler