hashcache 0.2.7 → 0.2.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0556a1ac315d90aaafa7350ba7c9c9919729203c
-  data.tar.gz: 98b97f53caf559b041a4b834480da47e0db0ff24
+  metadata.gz: 0ef610ae53b9f8b47d9aed3e654d0e17ad172693
+  data.tar.gz: 7dcfa3898412a7f04e74423beb37fab5eef44aff
 SHA512:
-  metadata.gz: 1952196f716d6070ea03786944bf34e2fad4ca1597d08798bf43092a71ae1ba9f8e63f2d9b2dfdf42c0bc14902eee8f5a82e69ca19c9d8e4c06dbb4e5081f3ad
-  data.tar.gz: bd3b7de3b1b6fb2d1a6e21bde501a43f6b39427b178a5a988a0012cfa90973229afb39afedee50e06f2269232052346a0b1be17cc1b69982b475c855952a4243
+  metadata.gz: 2e20a58a3a329e3dd1682f9bb2aed9fe4fd0edfd5656e870738a22e1f28a3ba2e8712b5aa585d0d63e0daac40027f1c07d66a54f00128070c902282ebfd0865f
+  data.tar.gz: fc84505bdd4dadd51e78a10c5180e932465f130f92197c7eda02e15a1d04b28743e7727008048c43b04bd41147005a97ec4050ac6a6f1ce6967ac78ad0f22147

data/lib/hashcache.rb

@@ -2,6 +2,9 @@
 
 # file: hashcache.rb
 
+require 'chronic_duration'
+
+
 class HashCache
   attr_accessor :size, :file_cache, :file_path
 
@@ -11,23 +14,36 @@ class HashCache
     @file_cache = o[:file_cache]
     @file_path = o[:file_path]
     @h = {}
+    
+    def @h.expired?(item)
+      expiry_time = self.fetch(item)[:expiry_time]
+      return false unless expiry_time
+      expiry_time < Time.now
+    end
+    
   end
 
   def read(item, &blk)
+
     if @h.include? item then
-      self.refresh item
+      !@h.expired?(item) ? self.refresh(item) : @h.delete(item)[:val]
     else
       if @file_cache == true and File.exists? @file_path + '/' + item then
-	read_file item
-      else
-	self.write(item) { blk.call }
+        read_file item
+      elsif block_given?
+        self.write(item) { blk.call }
       end
     end    
   end
   
-  def write(item, &blk)
-    val = blk.call
-    @h[item] = val
+  def write(item, duration=nil, &blk)
+    
+    expiry_time = nil
+    val = blk.call    
+        
+    expiry_time =  Time.now + ChronicDuration.parse(duration) if duration
+    
+    @h[item] = {val: val, expiry: duration, expiry_time: expiry_time}
     @h.shift if @h.length > @size
     write_file(item, val) if @file_cache == true
     val
@@ -36,10 +52,10 @@ class HashCache
   alias read! write
   
   def refresh(item)
-    val = @h[item]    
+    x = @h[item]    
     @h.delete item
-    @h[item] = val
-    val        
+    @h[item] = x
+    x[:val]
   end
 
   def reset

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hashcache
 version: !ruby/object:Gem::Version
-  version: 0.2.7
+  version: 0.2.8
 platform: ruby
 authors:
 - James Robertson
@@ -29,7 +29,7 @@ cert_chain:
   4WRZoiYQodl3YerqYrzebXd975yLfnxaW9zyzb8IZuAh+wMKMmP8jx8+iYrKBMdL
   32sy9WjqlU2iPHUEVZWTEcgbtjC3IziV
   -----END CERTIFICATE-----
-date: 2013-07-27 00:00:00.000000000 Z
+date: 2013-08-15 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: james@r0bertson.co.uk