frivol 0.1.6 → 0.1.7

data/VERSION

@@ -1 +1 @@
-0.1.6
+0.1.7

data/frivol.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{frivol}
-  s.version = "0.1.6"
+  s.version = "0.1.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Marc Heiligers"]
-  s.date = %q{2010-10-22}
+  s.date = %q{2010-11-01}
   s.description = %q{Simple Redis backed temporary storage intended primarily for use with ActiveRecord models to provide caching}
   s.email = %q{marc@eternal.co.za}
   s.extra_rdoc_files = [

data/lib/frivol.rb

@@ -241,7 +241,12 @@ module Frivol
     
     def self.store_counter(instance, counter, value)
       key = instance.send(:storage_key, counter)
+      is_new = !Frivol::Config.redis.exists(key)
       Frivol::Config.redis[key] = value
+      if is_new
+        time = instance.class.storage_expiry(counter)
+        Frivol::Config.redis.expire(key, time) if time != Frivol::NEVER_EXPIRE
+      end
     end
     
     def self.retrieve_counter(instance, counter, default)

data/test/fake_redis.rb

@@ -29,6 +29,10 @@ class Redis
     @expires[key] = Time.now + time
   end
   
+  def exists(key)
+    @storage.key? key
+  end
+  
   def flushdb
     @storage = {}
   end

data/test/test_frivol.rb

@@ -2,7 +2,7 @@ require 'helper'
 
 class TestFrivol < Test::Unit::TestCase
   def setup 
-    # fake_redis # Comment out this line to test against a real live Redis
+    fake_redis # Comment out this line to test against a real live Redis
     Frivol::Config.redis_config = { :thread_safe => true } # This will connect to a default Redis setup, otherwise set to { :host => "localhost", :port => 6379 }, for example
     Frivol::Config.redis.flushdb
   end
@@ -258,6 +258,34 @@ class TestFrivol < Test::Unit::TestCase
     assert_equal 11, t.increment_blue
     assert_equal 11, t.load_blue
   end
+  
+  should "set expiry on counters" do
+    class SetExpireCounterTestClass < TestClass
+      storage_bucket :sheep_counter, :counter => true, :expires_in => 0.5
+    end
+    t = SetExpireCounterTestClass.new
+    assert_equal 0.5, SetExpireCounterTestClass.storage_expiry(:sheep_counter)  
+  end
+
+  should "expire a counter bucket" do
+    class ExpireCounterTestClass < TestClass
+      storage_bucket :kitten_grave, :counter => true, :expires_in => 0.5
+
+      def bury_kittens
+        store_kitten_grave 10
+      end
+      
+      def peek_in_grave
+        retrieve_kitten_grave 0
+      end
+    end
+    k = ExpireCounterTestClass.new
+    k.bury_kittens
+    assert_equal 10, k.peek_in_grave
+    sleep(0.6)
+    assert_equal 0, k.peek_in_grave  
+    
+  end
 
   # Note: this test will fail from time to time using fake_redis because fake_redis is not thread safe
   should "have thread safe counters" do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: frivol
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: false
   segments: 
   - 0
   - 1
-  - 6
-  version: 0.1.6
+  - 7
+  version: 0.1.7
 platform: ruby
 authors: 
 - Marc Heiligers
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-22 00:00:00 +02:00
+date: 2010-11-01 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency