frivol 0.1.1 → 0.1.2

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.1.2

data/frivol.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{frivol}
-  s.version = "0.1.1"
+  s.version = "0.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Marc Heiligers"]

data/test/fake_redis.rb

@@ -1,10 +1,12 @@
 class Redis
   def initialize(config)
     @storage = {}
+    @expires = Hash.new(nil)
   end
 
   def [](key)
     # puts "retrieve #{key}"
+    return nil if !@expires[key].nil? && @expires[key] < Time.now
     @storage[key]
   end
 
@@ -14,7 +16,10 @@ class Redis
   end
 
   def expire(key, time)
-    # Hmm, let's not do anything here
-    # puts "expiring #{key} in #{time}"
+    @expires[key] = Time.now + time
+  end
+  
+  def flush_db
+    @storage = {}
   end
 end

data/test/test_frivol.rb

@@ -2,8 +2,12 @@ require 'helper'
 
 class TestFrivol < Test::Unit::TestCase
   def setup 
-    fake_redis
-    Frivol::Config.redis_config = {}
+    fake_redis # Comment out this line to test against a real live Redis
+    Frivol::Config.redis_config = {} # This will connect to a default Redis setup, otherwise set to { :host => "localhost", :port => 6379 }, for example
+  end
+  
+  def teardown
+    Frivol::Config.redis.flush_db
   end
   
   should "have a default storage key made up of the class name and id" do
@@ -51,7 +55,7 @@ class TestFrivol < Test::Unit::TestCase
     
     t = DefaultsTestClass.new
     t.save
-    assert_equal [ "value", "value2" ], t.load
+    assert_equal [ "value", "value2" ], t.load.sort
   end
 
   should "be able to override the key method" do
@@ -95,6 +99,15 @@ class TestFrivol < Test::Unit::TestCase
     t.save
   end
   
+  should "expires should not throw nasty errors" do
+    t = TestClass.new
+    t.save
+    t.expire_storage 0.5
+    sleep 1
+    t = TestClass.new # Get a fresh instance so that the @frivol_hash is empty
+    assert_equal "junk", t.load
+  end
+  
   should "be able to include in other classes with storage expiry" do
     class BlankTestClass
     end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: frivol
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 31
   prerelease: false
   segments: 
   - 0
   - 1
-  - 1
-  version: 0.1.1
+  - 2
+  version: 0.1.2
 platform: ruby
 authors: 
 - Marc Heiligers