moneta 0.7.9 → 0.7.10

data/script/start-services

@@ -5,4 +5,5 @@ sudo service redis-server start
 sudo service cassandra start
 sudo service memcached start
 sudo service mongodb start
+/usr/sbin/ttserver -dmn
 sleep 3

data/spec/helper.rb

@@ -1,7 +1,9 @@
+require 'rspec'
+require 'rspec/core/formatters/progress_formatter'
+require 'rspec/retry'
 require 'moneta'
 require 'fileutils'
 require 'monetaspecs'
-require 'rspec/core/formatters/progress_formatter'
 
 RSpec::Core::Formatters::ProgressFormatter.class_eval do
   def example_passed(example)
@@ -10,6 +12,7 @@ RSpec::Core::Formatters::ProgressFormatter.class_eval do
 end
 
 RSpec.configure do |config|
+  config.verbose_retry = true
   config.color_enabled = true
   config.tty = true
   config.formatter = :progress

data/spec/moneta/adapter_tokyotyrant_spec.rb

@@ -0,0 +1,30 @@
+# Generated by generate-specs
+require 'helper'
+
+describe_moneta "adapter_tokyotyrant" do
+  def log
+    @log ||= File.open(File.join(make_tempdir, 'adapter_tokyotyrant.log'), 'a')
+  end
+
+  def features
+    [:create, :increment]
+  end
+
+  def new_store
+    Moneta::Adapters::TokyoTyrant.new
+  end
+
+  def load_value(value)
+    Marshal.load(value)
+  end
+
+  include_context 'setup_store'
+  it_should_behave_like 'create'
+  it_should_behave_like 'features'
+  it_should_behave_like 'increment'
+  it_should_behave_like 'multiprocess'
+  it_should_behave_like 'null_stringkey_stringvalue'
+  it_should_behave_like 'persist_stringkey_stringvalue'
+  it_should_behave_like 'returndifferent_stringkey_stringvalue'
+  it_should_behave_like 'store_stringkey_stringvalue'
+end

data/spec/moneta/cache_file_memory_spec.rb

@@ -13,7 +13,7 @@ describe_moneta "cache_file_memory" do
   def new_store
     Moneta.build do
       use(:Cache) do
-        backend { adapter :File, :dir => File.join(make_tempdir, "cache_file_memory") }
+        adapter { adapter :File, :dir => File.join(make_tempdir, "cache_file_memory") }
         cache { adapter :Memory }
       end
     end
@@ -33,11 +33,11 @@ describe_moneta "cache_file_memory" do
   it_should_behave_like 'returnsame_stringkey_stringvalue'
   it_should_behave_like 'store_stringkey_stringvalue'
   it 'stores loaded values in cache' do
-    store.backend['foo'] = 'bar'
+    store.adapter['foo'] = 'bar'
     store.cache['foo'].should be_nil
     store['foo'].should == 'bar'
     store.cache['foo'].should == 'bar'
-    store.backend.delete('foo')
+    store.adapter.delete('foo')
     store['foo'].should == 'bar'
     store.delete('foo')
     store['foo'].should be_nil

data/spec/moneta/cache_memory_null_spec.rb

@@ -13,7 +13,7 @@ describe_moneta "cache_memory_null" do
   def new_store
     Moneta.build do
       use(:Cache) do
-        backend(Moneta::Adapters::Memory.new)
+        adapter(Moneta::Adapters::Memory.new)
         cache(Moneta::Adapters::Null.new)
       end
     end

data/spec/moneta/simple_tokyotyrant_spec.rb

@@ -0,0 +1,155 @@
+# Generated by generate-specs
+require 'helper'
+
+describe_moneta "simple_tokyotyrant" do
+  def log
+    @log ||= File.open(File.join(make_tempdir, 'simple_tokyotyrant.log'), 'a')
+  end
+
+  def features
+    [:create, :increment]
+  end
+
+  def new_store
+    Moneta.new(:TokyoTyrant, :logger => {:out => log})
+  end
+
+  def load_value(value)
+    Marshal.load(value)
+  end
+
+  include_context 'setup_store'
+  it_should_behave_like 'create'
+  it_should_behave_like 'features'
+  it_should_behave_like 'increment'
+  it_should_behave_like 'marshallable_key'
+  it_should_behave_like 'marshallable_value'
+  it_should_behave_like 'multiprocess'
+  it_should_behave_like 'null_objectkey_objectvalue'
+  it_should_behave_like 'null_objectkey_stringvalue'
+  it_should_behave_like 'null_objectkey_hashvalue'
+  it_should_behave_like 'null_objectkey_booleanvalue'
+  it_should_behave_like 'null_objectkey_nilvalue'
+  it_should_behave_like 'null_objectkey_integervalue'
+  it_should_behave_like 'null_stringkey_objectvalue'
+  it_should_behave_like 'null_stringkey_stringvalue'
+  it_should_behave_like 'null_stringkey_hashvalue'
+  it_should_behave_like 'null_stringkey_booleanvalue'
+  it_should_behave_like 'null_stringkey_nilvalue'
+  it_should_behave_like 'null_stringkey_integervalue'
+  it_should_behave_like 'null_hashkey_objectvalue'
+  it_should_behave_like 'null_hashkey_stringvalue'
+  it_should_behave_like 'null_hashkey_hashvalue'
+  it_should_behave_like 'null_hashkey_booleanvalue'
+  it_should_behave_like 'null_hashkey_nilvalue'
+  it_should_behave_like 'null_hashkey_integervalue'
+  it_should_behave_like 'null_booleankey_objectvalue'
+  it_should_behave_like 'null_booleankey_stringvalue'
+  it_should_behave_like 'null_booleankey_hashvalue'
+  it_should_behave_like 'null_booleankey_booleanvalue'
+  it_should_behave_like 'null_booleankey_nilvalue'
+  it_should_behave_like 'null_booleankey_integervalue'
+  it_should_behave_like 'null_nilkey_objectvalue'
+  it_should_behave_like 'null_nilkey_stringvalue'
+  it_should_behave_like 'null_nilkey_hashvalue'
+  it_should_behave_like 'null_nilkey_booleanvalue'
+  it_should_behave_like 'null_nilkey_nilvalue'
+  it_should_behave_like 'null_nilkey_integervalue'
+  it_should_behave_like 'null_integerkey_objectvalue'
+  it_should_behave_like 'null_integerkey_stringvalue'
+  it_should_behave_like 'null_integerkey_hashvalue'
+  it_should_behave_like 'null_integerkey_booleanvalue'
+  it_should_behave_like 'null_integerkey_nilvalue'
+  it_should_behave_like 'null_integerkey_integervalue'
+  it_should_behave_like 'persist_objectkey_objectvalue'
+  it_should_behave_like 'persist_objectkey_stringvalue'
+  it_should_behave_like 'persist_objectkey_hashvalue'
+  it_should_behave_like 'persist_objectkey_booleanvalue'
+  it_should_behave_like 'persist_objectkey_nilvalue'
+  it_should_behave_like 'persist_objectkey_integervalue'
+  it_should_behave_like 'persist_stringkey_objectvalue'
+  it_should_behave_like 'persist_stringkey_stringvalue'
+  it_should_behave_like 'persist_stringkey_hashvalue'
+  it_should_behave_like 'persist_stringkey_booleanvalue'
+  it_should_behave_like 'persist_stringkey_nilvalue'
+  it_should_behave_like 'persist_stringkey_integervalue'
+  it_should_behave_like 'persist_hashkey_objectvalue'
+  it_should_behave_like 'persist_hashkey_stringvalue'
+  it_should_behave_like 'persist_hashkey_hashvalue'
+  it_should_behave_like 'persist_hashkey_booleanvalue'
+  it_should_behave_like 'persist_hashkey_nilvalue'
+  it_should_behave_like 'persist_hashkey_integervalue'
+  it_should_behave_like 'persist_booleankey_objectvalue'
+  it_should_behave_like 'persist_booleankey_stringvalue'
+  it_should_behave_like 'persist_booleankey_hashvalue'
+  it_should_behave_like 'persist_booleankey_booleanvalue'
+  it_should_behave_like 'persist_booleankey_nilvalue'
+  it_should_behave_like 'persist_booleankey_integervalue'
+  it_should_behave_like 'persist_nilkey_objectvalue'
+  it_should_behave_like 'persist_nilkey_stringvalue'
+  it_should_behave_like 'persist_nilkey_hashvalue'
+  it_should_behave_like 'persist_nilkey_booleanvalue'
+  it_should_behave_like 'persist_nilkey_nilvalue'
+  it_should_behave_like 'persist_nilkey_integervalue'
+  it_should_behave_like 'persist_integerkey_objectvalue'
+  it_should_behave_like 'persist_integerkey_stringvalue'
+  it_should_behave_like 'persist_integerkey_hashvalue'
+  it_should_behave_like 'persist_integerkey_booleanvalue'
+  it_should_behave_like 'persist_integerkey_nilvalue'
+  it_should_behave_like 'persist_integerkey_integervalue'
+  it_should_behave_like 'returndifferent_objectkey_objectvalue'
+  it_should_behave_like 'returndifferent_objectkey_stringvalue'
+  it_should_behave_like 'returndifferent_objectkey_hashvalue'
+  it_should_behave_like 'returndifferent_stringkey_objectvalue'
+  it_should_behave_like 'returndifferent_stringkey_stringvalue'
+  it_should_behave_like 'returndifferent_stringkey_hashvalue'
+  it_should_behave_like 'returndifferent_hashkey_objectvalue'
+  it_should_behave_like 'returndifferent_hashkey_stringvalue'
+  it_should_behave_like 'returndifferent_hashkey_hashvalue'
+  it_should_behave_like 'returndifferent_booleankey_objectvalue'
+  it_should_behave_like 'returndifferent_booleankey_stringvalue'
+  it_should_behave_like 'returndifferent_booleankey_hashvalue'
+  it_should_behave_like 'returndifferent_nilkey_objectvalue'
+  it_should_behave_like 'returndifferent_nilkey_stringvalue'
+  it_should_behave_like 'returndifferent_nilkey_hashvalue'
+  it_should_behave_like 'returndifferent_integerkey_objectvalue'
+  it_should_behave_like 'returndifferent_integerkey_stringvalue'
+  it_should_behave_like 'returndifferent_integerkey_hashvalue'
+  it_should_behave_like 'store_objectkey_objectvalue'
+  it_should_behave_like 'store_objectkey_stringvalue'
+  it_should_behave_like 'store_objectkey_hashvalue'
+  it_should_behave_like 'store_objectkey_booleanvalue'
+  it_should_behave_like 'store_objectkey_nilvalue'
+  it_should_behave_like 'store_objectkey_integervalue'
+  it_should_behave_like 'store_stringkey_objectvalue'
+  it_should_behave_like 'store_stringkey_stringvalue'
+  it_should_behave_like 'store_stringkey_hashvalue'
+  it_should_behave_like 'store_stringkey_booleanvalue'
+  it_should_behave_like 'store_stringkey_nilvalue'
+  it_should_behave_like 'store_stringkey_integervalue'
+  it_should_behave_like 'store_hashkey_objectvalue'
+  it_should_behave_like 'store_hashkey_stringvalue'
+  it_should_behave_like 'store_hashkey_hashvalue'
+  it_should_behave_like 'store_hashkey_booleanvalue'
+  it_should_behave_like 'store_hashkey_nilvalue'
+  it_should_behave_like 'store_hashkey_integervalue'
+  it_should_behave_like 'store_booleankey_objectvalue'
+  it_should_behave_like 'store_booleankey_stringvalue'
+  it_should_behave_like 'store_booleankey_hashvalue'
+  it_should_behave_like 'store_booleankey_booleanvalue'
+  it_should_behave_like 'store_booleankey_nilvalue'
+  it_should_behave_like 'store_booleankey_integervalue'
+  it_should_behave_like 'store_nilkey_objectvalue'
+  it_should_behave_like 'store_nilkey_stringvalue'
+  it_should_behave_like 'store_nilkey_hashvalue'
+  it_should_behave_like 'store_nilkey_booleanvalue'
+  it_should_behave_like 'store_nilkey_nilvalue'
+  it_should_behave_like 'store_nilkey_integervalue'
+  it_should_behave_like 'store_integerkey_objectvalue'
+  it_should_behave_like 'store_integerkey_stringvalue'
+  it_should_behave_like 'store_integerkey_hashvalue'
+  it_should_behave_like 'store_integerkey_booleanvalue'
+  it_should_behave_like 'store_integerkey_nilvalue'
+  it_should_behave_like 'store_integerkey_integervalue'
+  it_should_behave_like 'transform_value'
+end

data/spec/moneta/simple_tokyotyrant_with_expires_spec.rb

@@ -0,0 +1,157 @@
+# Generated by generate-specs
+require 'helper'
+
+describe_moneta "simple_tokyotyrant_with_expires" do
+  def log
+    @log ||= File.open(File.join(make_tempdir, 'simple_tokyotyrant_with_expires.log'), 'a')
+  end
+
+  def features
+    [:create, :expires, :increment]
+  end
+
+  def new_store
+    Moneta.new(:TokyoTyrant, :expires => true, :logger => {:out => log})
+  end
+
+  def load_value(value)
+    Marshal.load(value)
+  end
+
+  include_context 'setup_store'
+  it_should_behave_like 'create'
+  it_should_behave_like 'create_expires'
+  it_should_behave_like 'expires'
+  it_should_behave_like 'features'
+  it_should_behave_like 'increment'
+  it_should_behave_like 'marshallable_key'
+  it_should_behave_like 'marshallable_value'
+  it_should_behave_like 'multiprocess'
+  it_should_behave_like 'null_objectkey_objectvalue'
+  it_should_behave_like 'null_objectkey_stringvalue'
+  it_should_behave_like 'null_objectkey_hashvalue'
+  it_should_behave_like 'null_objectkey_booleanvalue'
+  it_should_behave_like 'null_objectkey_nilvalue'
+  it_should_behave_like 'null_objectkey_integervalue'
+  it_should_behave_like 'null_stringkey_objectvalue'
+  it_should_behave_like 'null_stringkey_stringvalue'
+  it_should_behave_like 'null_stringkey_hashvalue'
+  it_should_behave_like 'null_stringkey_booleanvalue'
+  it_should_behave_like 'null_stringkey_nilvalue'
+  it_should_behave_like 'null_stringkey_integervalue'
+  it_should_behave_like 'null_hashkey_objectvalue'
+  it_should_behave_like 'null_hashkey_stringvalue'
+  it_should_behave_like 'null_hashkey_hashvalue'
+  it_should_behave_like 'null_hashkey_booleanvalue'
+  it_should_behave_like 'null_hashkey_nilvalue'
+  it_should_behave_like 'null_hashkey_integervalue'
+  it_should_behave_like 'null_booleankey_objectvalue'
+  it_should_behave_like 'null_booleankey_stringvalue'
+  it_should_behave_like 'null_booleankey_hashvalue'
+  it_should_behave_like 'null_booleankey_booleanvalue'
+  it_should_behave_like 'null_booleankey_nilvalue'
+  it_should_behave_like 'null_booleankey_integervalue'
+  it_should_behave_like 'null_nilkey_objectvalue'
+  it_should_behave_like 'null_nilkey_stringvalue'
+  it_should_behave_like 'null_nilkey_hashvalue'
+  it_should_behave_like 'null_nilkey_booleanvalue'
+  it_should_behave_like 'null_nilkey_nilvalue'
+  it_should_behave_like 'null_nilkey_integervalue'
+  it_should_behave_like 'null_integerkey_objectvalue'
+  it_should_behave_like 'null_integerkey_stringvalue'
+  it_should_behave_like 'null_integerkey_hashvalue'
+  it_should_behave_like 'null_integerkey_booleanvalue'
+  it_should_behave_like 'null_integerkey_nilvalue'
+  it_should_behave_like 'null_integerkey_integervalue'
+  it_should_behave_like 'persist_objectkey_objectvalue'
+  it_should_behave_like 'persist_objectkey_stringvalue'
+  it_should_behave_like 'persist_objectkey_hashvalue'
+  it_should_behave_like 'persist_objectkey_booleanvalue'
+  it_should_behave_like 'persist_objectkey_nilvalue'
+  it_should_behave_like 'persist_objectkey_integervalue'
+  it_should_behave_like 'persist_stringkey_objectvalue'
+  it_should_behave_like 'persist_stringkey_stringvalue'
+  it_should_behave_like 'persist_stringkey_hashvalue'
+  it_should_behave_like 'persist_stringkey_booleanvalue'
+  it_should_behave_like 'persist_stringkey_nilvalue'
+  it_should_behave_like 'persist_stringkey_integervalue'
+  it_should_behave_like 'persist_hashkey_objectvalue'
+  it_should_behave_like 'persist_hashkey_stringvalue'
+  it_should_behave_like 'persist_hashkey_hashvalue'
+  it_should_behave_like 'persist_hashkey_booleanvalue'
+  it_should_behave_like 'persist_hashkey_nilvalue'
+  it_should_behave_like 'persist_hashkey_integervalue'
+  it_should_behave_like 'persist_booleankey_objectvalue'
+  it_should_behave_like 'persist_booleankey_stringvalue'
+  it_should_behave_like 'persist_booleankey_hashvalue'
+  it_should_behave_like 'persist_booleankey_booleanvalue'
+  it_should_behave_like 'persist_booleankey_nilvalue'
+  it_should_behave_like 'persist_booleankey_integervalue'
+  it_should_behave_like 'persist_nilkey_objectvalue'
+  it_should_behave_like 'persist_nilkey_stringvalue'
+  it_should_behave_like 'persist_nilkey_hashvalue'
+  it_should_behave_like 'persist_nilkey_booleanvalue'
+  it_should_behave_like 'persist_nilkey_nilvalue'
+  it_should_behave_like 'persist_nilkey_integervalue'
+  it_should_behave_like 'persist_integerkey_objectvalue'
+  it_should_behave_like 'persist_integerkey_stringvalue'
+  it_should_behave_like 'persist_integerkey_hashvalue'
+  it_should_behave_like 'persist_integerkey_booleanvalue'
+  it_should_behave_like 'persist_integerkey_nilvalue'
+  it_should_behave_like 'persist_integerkey_integervalue'
+  it_should_behave_like 'returndifferent_objectkey_objectvalue'
+  it_should_behave_like 'returndifferent_objectkey_stringvalue'
+  it_should_behave_like 'returndifferent_objectkey_hashvalue'
+  it_should_behave_like 'returndifferent_stringkey_objectvalue'
+  it_should_behave_like 'returndifferent_stringkey_stringvalue'
+  it_should_behave_like 'returndifferent_stringkey_hashvalue'
+  it_should_behave_like 'returndifferent_hashkey_objectvalue'
+  it_should_behave_like 'returndifferent_hashkey_stringvalue'
+  it_should_behave_like 'returndifferent_hashkey_hashvalue'
+  it_should_behave_like 'returndifferent_booleankey_objectvalue'
+  it_should_behave_like 'returndifferent_booleankey_stringvalue'
+  it_should_behave_like 'returndifferent_booleankey_hashvalue'
+  it_should_behave_like 'returndifferent_nilkey_objectvalue'
+  it_should_behave_like 'returndifferent_nilkey_stringvalue'
+  it_should_behave_like 'returndifferent_nilkey_hashvalue'
+  it_should_behave_like 'returndifferent_integerkey_objectvalue'
+  it_should_behave_like 'returndifferent_integerkey_stringvalue'
+  it_should_behave_like 'returndifferent_integerkey_hashvalue'
+  it_should_behave_like 'store_objectkey_objectvalue'
+  it_should_behave_like 'store_objectkey_stringvalue'
+  it_should_behave_like 'store_objectkey_hashvalue'
+  it_should_behave_like 'store_objectkey_booleanvalue'
+  it_should_behave_like 'store_objectkey_nilvalue'
+  it_should_behave_like 'store_objectkey_integervalue'
+  it_should_behave_like 'store_stringkey_objectvalue'
+  it_should_behave_like 'store_stringkey_stringvalue'
+  it_should_behave_like 'store_stringkey_hashvalue'
+  it_should_behave_like 'store_stringkey_booleanvalue'
+  it_should_behave_like 'store_stringkey_nilvalue'
+  it_should_behave_like 'store_stringkey_integervalue'
+  it_should_behave_like 'store_hashkey_objectvalue'
+  it_should_behave_like 'store_hashkey_stringvalue'
+  it_should_behave_like 'store_hashkey_hashvalue'
+  it_should_behave_like 'store_hashkey_booleanvalue'
+  it_should_behave_like 'store_hashkey_nilvalue'
+  it_should_behave_like 'store_hashkey_integervalue'
+  it_should_behave_like 'store_booleankey_objectvalue'
+  it_should_behave_like 'store_booleankey_stringvalue'
+  it_should_behave_like 'store_booleankey_hashvalue'
+  it_should_behave_like 'store_booleankey_booleanvalue'
+  it_should_behave_like 'store_booleankey_nilvalue'
+  it_should_behave_like 'store_booleankey_integervalue'
+  it_should_behave_like 'store_nilkey_objectvalue'
+  it_should_behave_like 'store_nilkey_stringvalue'
+  it_should_behave_like 'store_nilkey_hashvalue'
+  it_should_behave_like 'store_nilkey_booleanvalue'
+  it_should_behave_like 'store_nilkey_nilvalue'
+  it_should_behave_like 'store_nilkey_integervalue'
+  it_should_behave_like 'store_integerkey_objectvalue'
+  it_should_behave_like 'store_integerkey_stringvalue'
+  it_should_behave_like 'store_integerkey_hashvalue'
+  it_should_behave_like 'store_integerkey_booleanvalue'
+  it_should_behave_like 'store_integerkey_nilvalue'
+  it_should_behave_like 'store_integerkey_integervalue'
+  it_should_behave_like 'transform_value_expires'
+end

data/spec/monetaspecs.rb

@@ -16898,146 +16898,188 @@ end
 #################### expires ####################
 
 shared_examples_for 'expires' do
-  it 'supports expires on store and #[]' do
-    store.store('key1', 'val1', :expires => 2)
+  it 'supports expires on store and []', :retry => 3 do
+    store.store('key1', 'val1', :expires => 3)
     store['key1'].should == 'val1'
     sleep 1
     store['key1'].should == 'val1'
-    sleep 2
+    sleep 3
+    store['key1'].should be_nil
+  end
+
+  it 'supports strict expires on store and []' do
+    store.store('key1', 'val1', :expires => 2)
+    store['key1'].should == 'val1'
+    sleep 3 # Sleep 3 seconds because after 2 seconds the value can still exist!
     store['key1'].should be_nil
   end
 
-  it 'supports 0 as no-expires on store and #[]' do
+  it 'supports expires on store and fetch', :retry => 3 do
+    store.store('key1', 'val1', :expires => 3)
+    store.fetch('key1').should == 'val1'
+    sleep 1
+    store.fetch('key1').should == 'val1'
+    sleep 3
+    store.fetch('key1').should be_nil
+  end
+
+  it 'supports strict expires on store and fetch' do
+    store.store('key1', 'val1', :expires => 2)
+    store.fetch('key1').should == 'val1'
+    sleep 3 # Sleep 3 seconds because after 2 seconds the value can still exist!
+    store.fetch('key1').should be_nil
+  end
+
+  it 'supports 0 as no-expires on store and []' do
     store.store('key1', 'val1', :expires => 0)
     store['key1'].should == 'val1'
     sleep 2
     store['key1'].should == 'val1'
   end
 
-  it 'supports false as no-expires on store and #[]' do
+  it 'supports false as no-expires on store and []' do
     store.store('key1', 'val1', :expires => false)
     store['key1'].should == 'val1'
     sleep 2
     store['key1'].should == 'val1'
   end
 
-  it 'supports expires on store and load' do
-    store.store('key1', 'val1', :expires => 2)
+  it 'supports expires on store and load', :retry => 3 do
+    store.store('key1', 'val1', :expires => 3)
     store.load('key1').should == 'val1'
     sleep 1
     store.load('key1').should == 'val1'
-    sleep 2
+    sleep 3
     store.load('key1').should be_nil
   end
 
-  it 'supports expires on store and key?' do
+  it 'supports strict expires on store and load' do
     store.store('key1', 'val1', :expires => 2)
+    store.load('key1').should == 'val1'
+    sleep 3 # Sleep 3 seconds because after 2 seconds the value can still exist!
+    store.load('key1').should be_nil
+  end
+
+  it 'supports expires on store and key?', :retry => 3 do
+    store.store('key1', 'val1', :expires => 3)
     store.key?('key1').should be_true
     sleep 1
     store.key?('key1').should be_true
-    sleep 2
+    sleep 3
     store.key?('key1').should be_false
   end
 
-  it 'supports updating the expiration time in load' do
-    store.store('key2', 'val2', :expires => 2)
+  it 'supports strict expires on store and key?' do
+    store.store('key1', 'val1', :expires => 2)
+    store.key?('key1').should be_true
+    sleep 3 # Sleep 3 seconds because after 2 seconds the value can still exist!
+    store.key?('key1').should be_false
+  end
+
+  it 'supports updating the expiration time in load', :retry => 3 do
+    store.store('key2', 'val2', :expires => 3)
     store['key2'].should == 'val2'
     sleep 1
-    store.load('key2', :expires => 3).should == 'val2'
+    store.load('key2', :expires => 5).should == 'val2'
     store['key2'].should == 'val2'
-    sleep 2
+    sleep 3
     store['key2'].should == 'val2'
-    sleep 2
+    sleep 3
     store['key2'].should be_nil
   end
 
   it 'supports 0 as no-expires in load' do
     store.store('key1', 'val1', :expires => 2)
     store.load('key1', :expires => 0).should == 'val1'
-    sleep 2
+    sleep 3
     store.load('key1').should == 'val1'
   end
 
   it 'supports false as no-expires in load' do
     store.store('key1', 'val1', :expires => 2)
     store.load('key1', :expires => false).should == 'val1'
-    sleep 2
+    sleep 3
     store.load('key1').should == 'val1'
   end
 
-  it 'supports updating the expiration time in key?' do
-    store.store('key2', 'val2', :expires => 2)
+  it 'supports updating the expiration time in key?', :retry => 3 do
+    store.store('key2', 'val2', :expires => 3)
     store['key2'].should == 'val2'
     sleep 1
-    store.key?('key2', :expires => 3).should be_true
+    store.key?('key2', :expires => 5).should be_true
     store['key2'].should == 'val2'
-    sleep 2
+    sleep 3
     store['key2'].should == 'val2'
-    sleep 2
+    sleep 3
     store['key2'].should be_nil
   end
 
   it 'supports 0 as no-expires in key?' do
     store.store('key1', 'val1', :expires => 2)
     store.key?('key1', :expires => 0).should be_true
-    sleep 2
+    sleep 3
     store['key1'].should == 'val1'
   end
 
   it 'supports false as no-expires in key?' do
     store.store('key1', 'val1', :expires => 2)
     store.key?('key1', :expires => false ).should be_true
-    sleep 2
+    sleep 3
     store['key1'].should == 'val1'
   end
 
-  it 'supports updating the expiration time in fetch' do
-    store.store('key1', 'val1', :expires => 2)
+  it 'supports updating the expiration time in fetch', :retry => 3 do
+    store.store('key1', 'val1', :expires => 3)
     store['key1'].should == 'val1'
     sleep 1
-    store.fetch('key1', nil, :expires => 3).should == 'val1'
+    store.fetch('key1', nil, :expires => 5).should == 'val1'
     store['key1'].should == 'val1'
-    sleep 2
+    sleep 3
     store['key1'].should == 'val1'
-    sleep 2
+    sleep 3
     store['key1'].should be_nil
   end
 
   it 'supports 0 as no-expires in fetch' do
     store.store('key1', 'val1', :expires => 2)
     store.fetch('key1', nil, :expires => 0).should == 'val1'
-    sleep 2
+    sleep 3
     store.load('key1').should == 'val1'
   end
 
   it 'supports false as no-expires in fetch' do
     store.store('key1', 'val1', :expires => 2)
     store.fetch('key1', nil, :expires => false).should == 'val1'
-    sleep 2
+    sleep 3
     store.load('key1').should == 'val1'
   end
 
-  it 'respects expires in delete' do
+  it 'strictly respects expires in delete' do
     store.store('key2', 'val2', :expires => 2)
     store['key2'].should == 'val2'
+    sleep 3 # Sleep 3 seconds because after 2 seconds the value can still exist!
+    store.delete('key2').should be_nil
+  end
+
+  it 'respects expires in delete', :retry => 3 do
+    store.store('key2', 'val2', :expires => 3)
+    store['key2'].should == 'val2'
     sleep 1
     store['key2'].should == 'val2'
-    sleep 2
+    sleep 3
     store.delete('key2').should be_nil
   end
 
   it 'supports the #expires syntactic sugar' do
     store.store('persistent_key', 'persistent_value', :expires => 0)
-    store.expires(2).store('key2', 'val2')
-    store['key2'].should == 'val2'
-    sleep 1
+    store.expires(1).store('key2', 'val2')
     store['key2'].should == 'val2'
     sleep 2
     store.delete('key2').should be_nil
     store['persistent_key'].should == 'persistent_value'
   end
 
-  it 'supports false as no-expires on store and #[]' do
+  it 'supports false as no-expires on store and []' do
     store.store('key1', 'val1', :expires => false)
     store['key1'].should == 'val1'
     sleep 2