juno 0.3.0 → 0.3.1

data/spec/junospecs.rb

@@ -1,5 +1,183 @@
 # Generated by generate.rb
 
+#################### null_stringkey_booleanvalue ####################
+
+shared_examples_for 'null_stringkey_booleanvalue' do
+  it "reads from keys that are Strings like a Hash" do
+    store["strkey1"].should == nil
+    store.load("strkey1").should == nil
+  end
+
+  it "guarantees that the same Boolean value is returned when setting a String key" do
+    value = true
+    (store["strkey1"] = value).should equal(value)
+  end
+
+  it "returns false from key? if a String key is not available" do
+    store.key?("strkey1").should == false
+  end
+
+  it "returns nil from delete if an element for a String key does not exist" do
+    store.delete("strkey1").should == nil
+  end
+
+  it "removes all String keys from the store with clear" do
+    store["strkey1"] = true
+    store["strkey2"] = false
+    store.clear.should equal(store)
+    store.key?("strkey1").should_not ==  true
+    store.key?("strkey2").should_not == true
+  end
+
+  it "fetches a String key with a default value with fetch, if the key is not available" do
+    store.fetch("strkey1", true).should == true
+  end
+
+  it "fetches a String key with a block with fetch, if the key is not available" do
+    key = "strkey1"
+    value = true
+    store.fetch(key) do |k|
+      k.should equal(key)
+      value
+    end.should equal(value)
+  end
+
+  it 'should accept options' do
+    store.key?("strkey1", :option1 => 1).should == false
+    store.load("strkey1", :option2 => 2).should == nil
+    store.fetch("strkey1", 42, :option3 => 3).should == 42
+    store.fetch("strkey1", :option3 => 3) { 42 }.should == 42
+    store.delete("strkey1", :option4 => 4).should == nil
+    store.clear(:option5 => 5).should equal(store)
+    store.store("strkey1", true, :option6 => 6).should == true
+  end
+end
+
+#################### store_stringkey_booleanvalue ####################
+
+shared_examples_for 'store_stringkey_booleanvalue' do
+  it "writes Boolean values to keys that are Strings like a Hash" do
+    store["strkey1"] = true
+    store["strkey1"].should == true
+    store.load("strkey1").should == true
+  end
+
+  it "returns true from key? if a String key is available" do
+    store["strkey1"] = true
+    store.key?("strkey1").should == true
+    store["strkey2"] = false
+    store.key?("strkey2").should == true
+  end
+
+  it "stores Boolean values with String keys with #store" do
+    value = true
+    store.store("strkey1", value).should equal(value)
+    store["strkey1"].should == true
+    store.load("strkey1").should == true
+  end
+
+  it "removes and returns a Boolean element with a String key from the backing store via delete if it exists" do
+    store["strkey1"] = true
+    store.delete("strkey1").should == true
+    store.key?("strkey1").should == false
+  end
+
+  it "overwrites existing Boolean values with String" do
+    store["strkey1"] = true
+    store["strkey1"].should == true
+    store["strkey1"] = false
+    store["strkey1"].should == false
+  end
+
+  it "does not run the block if the String key is available" do
+    store["strkey1"] = true
+    unaltered = "unaltered"
+    store.fetch("strkey1") { unaltered = "altered" }
+    unaltered.should == "unaltered"
+  end
+
+  it "fetches a String key with a default value with fetch, if the key is available" do
+    store["strkey1"] = true
+    store.fetch("strkey1", false).should == true
+  end
+end
+
+#################### expires_stringkey_booleanvalue ####################
+
+shared_examples_for 'expires_stringkey_booleanvalue' do
+  it 'should support expires on store and #[]' do
+    store.store("strkey1", true, :expires => 2)
+    store["strkey1"].should == true
+    sleep 1
+    store["strkey1"].should == true
+    sleep 2
+    store["strkey1"].should == nil
+  end
+
+  it 'should support expires on store and load' do
+    store.store("strkey1", true, :expires => 2)
+    store.load("strkey1").should == true
+    sleep 1
+    store.load("strkey1").should == true
+    sleep 2
+    store.load("strkey1").should == nil
+  end
+
+  it 'should support expires on store and key?' do
+    store.store("strkey1", true, :expires => 2)
+    store.key?("strkey1").should == true
+    sleep 1
+    store.key?("strkey1").should == true
+    sleep 2
+    store.key?("strkey1").should == false
+  end
+
+  it 'should support updating the expiration time in load' do
+    store.store("strkey2", false, :expires => 2)
+    store["strkey2"].should == false
+    sleep 1
+    store.load("strkey2", :expires => 3).should == false
+    store["strkey2"].should == false
+    sleep 1
+    store["strkey2"].should == false
+    sleep 3
+    store["strkey2"].should == nil
+  end
+
+  it 'should support updating the expiration time in key?' do
+    store.store("strkey2", false, :expires => 2)
+    store["strkey2"].should == false
+    sleep 1
+    store.key?("strkey2", :expires => 3).should be_true
+    store["strkey2"].should == false
+    sleep 1
+    store["strkey2"].should == false
+    sleep 3
+    store["strkey2"].should == nil
+  end
+
+  it 'should support updating the expiration time in fetch' do
+    store.store("strkey1", true, :expires => 2)
+    store["strkey1"].should == true
+    sleep 1
+    store.fetch("strkey1", nil, :expires => 3).should == true
+    store["strkey1"].should == true
+    sleep 1
+    store["strkey1"].should == true
+    sleep 3
+    store["strkey1"].should == nil
+  end
+
+  it 'should respect expires in delete' do
+    store.store("strkey2", false, :expires => 2)
+    store["strkey2"].should == false
+    sleep 1
+    store["strkey2"].should == false
+    sleep 2
+    store.delete("strkey2").should == nil
+  end
+end
+
 #################### null_stringkey_stringvalue ####################
 
 shared_examples_for 'null_stringkey_stringvalue' do
@@ -65,6 +243,8 @@ shared_examples_for 'store_stringkey_stringvalue' do
   it "returns true from key? if a String key is available" do
     store["strkey1"] = "strval1"
     store.key?("strkey1").should == true
+    store["strkey2"] = "strval2"
+    store.key?("strkey2").should == true
   end
 
   it "stores String values with String keys with #store" do
@@ -152,6 +332,18 @@ shared_examples_for 'expires_stringkey_stringvalue' do
     store["strkey2"].should == nil
   end
 
+  it 'should support updating the expiration time in key?' do
+    store.store("strkey2", "strval2", :expires => 2)
+    store["strkey2"].should == "strval2"
+    sleep 1
+    store.key?("strkey2", :expires => 3).should be_true
+    store["strkey2"].should == "strval2"
+    sleep 1
+    store["strkey2"].should == "strval2"
+    sleep 3
+    store["strkey2"].should == nil
+  end
+
   it 'should support updating the expiration time in fetch' do
     store.store("strkey1", "strval1", :expires => 2)
     store["strkey1"].should == "strval1"
@@ -174,6 +366,194 @@ shared_examples_for 'expires_stringkey_stringvalue' do
   end
 end
 
+#################### null_stringkey_hashvalue ####################
+
+shared_examples_for 'null_stringkey_hashvalue' do
+  it "reads from keys that are Strings like a Hash" do
+    store["strkey1"].should == nil
+    store.load("strkey1").should == nil
+  end
+
+  it "guarantees that the same Hash value is returned when setting a String key" do
+    value = {"hashval1"=>["array1", 1]}
+    (store["strkey1"] = value).should equal(value)
+  end
+
+  it "returns false from key? if a String key is not available" do
+    store.key?("strkey1").should == false
+  end
+
+  it "returns nil from delete if an element for a String key does not exist" do
+    store.delete("strkey1").should == nil
+  end
+
+  it "removes all String keys from the store with clear" do
+    store["strkey1"] = {"hashval1"=>["array1", 1]}
+    store["strkey2"] = {"hashval3"=>["array2", {"hashval4"=>42}]}
+    store.clear.should equal(store)
+    store.key?("strkey1").should_not ==  true
+    store.key?("strkey2").should_not == true
+  end
+
+  it "fetches a String key with a default value with fetch, if the key is not available" do
+    store.fetch("strkey1", {"hashval1"=>["array1", 1]}).should == {"hashval1"=>["array1", 1]}
+  end
+
+  it "fetches a String key with a block with fetch, if the key is not available" do
+    key = "strkey1"
+    value = {"hashval1"=>["array1", 1]}
+    store.fetch(key) do |k|
+      k.should equal(key)
+      value
+    end.should equal(value)
+  end
+
+  it 'should accept options' do
+    store.key?("strkey1", :option1 => 1).should == false
+    store.load("strkey1", :option2 => 2).should == nil
+    store.fetch("strkey1", 42, :option3 => 3).should == 42
+    store.fetch("strkey1", :option3 => 3) { 42 }.should == 42
+    store.delete("strkey1", :option4 => 4).should == nil
+    store.clear(:option5 => 5).should equal(store)
+    store.store("strkey1", {"hashval1"=>["array1", 1]}, :option6 => 6).should == {"hashval1"=>["array1", 1]}
+  end
+end
+
+#################### store_stringkey_hashvalue ####################
+
+shared_examples_for 'store_stringkey_hashvalue' do
+  it "writes Hash values to keys that are Strings like a Hash" do
+    store["strkey1"] = {"hashval1"=>["array1", 1]}
+    store["strkey1"].should == {"hashval1"=>["array1", 1]}
+    store.load("strkey1").should == {"hashval1"=>["array1", 1]}
+  end
+
+  it "returns true from key? if a String key is available" do
+    store["strkey1"] = {"hashval1"=>["array1", 1]}
+    store.key?("strkey1").should == true
+    store["strkey2"] = {"hashval3"=>["array2", {"hashval4"=>42}]}
+    store.key?("strkey2").should == true
+  end
+
+  it "stores Hash values with String keys with #store" do
+    value = {"hashval1"=>["array1", 1]}
+    store.store("strkey1", value).should equal(value)
+    store["strkey1"].should == {"hashval1"=>["array1", 1]}
+    store.load("strkey1").should == {"hashval1"=>["array1", 1]}
+  end
+
+  it "removes and returns a Hash element with a String key from the backing store via delete if it exists" do
+    store["strkey1"] = {"hashval1"=>["array1", 1]}
+    store.delete("strkey1").should == {"hashval1"=>["array1", 1]}
+    store.key?("strkey1").should == false
+  end
+
+  it "overwrites existing Hash values with String" do
+    store["strkey1"] = {"hashval1"=>["array1", 1]}
+    store["strkey1"].should == {"hashval1"=>["array1", 1]}
+    store["strkey1"] = {"hashval3"=>["array2", {"hashval4"=>42}]}
+    store["strkey1"].should == {"hashval3"=>["array2", {"hashval4"=>42}]}
+  end
+
+  it "does not run the block if the String key is available" do
+    store["strkey1"] = {"hashval1"=>["array1", 1]}
+    unaltered = "unaltered"
+    store.fetch("strkey1") { unaltered = "altered" }
+    unaltered.should == "unaltered"
+  end
+
+  it "fetches a String key with a default value with fetch, if the key is available" do
+    store["strkey1"] = {"hashval1"=>["array1", 1]}
+    store.fetch("strkey1", {"hashval3"=>["array2", {"hashval4"=>42}]}).should == {"hashval1"=>["array1", 1]}
+  end
+end
+
+#################### returndifferent_stringkey_hashvalue ####################
+
+shared_examples_for 'returndifferent_stringkey_hashvalue' do
+  it "guarantees that a different Hash value is retrieved from the String key" do
+    value = {"hashval1"=>["array1", 1]}
+    store["strkey1"] = {"hashval1"=>["array1", 1]}
+    store["strkey1"].should_not be_equal({"hashval1"=>["array1", 1]})
+  end
+end
+
+#################### expires_stringkey_hashvalue ####################
+
+shared_examples_for 'expires_stringkey_hashvalue' do
+  it 'should support expires on store and #[]' do
+    store.store("strkey1", {"hashval1"=>["array1", 1]}, :expires => 2)
+    store["strkey1"].should == {"hashval1"=>["array1", 1]}
+    sleep 1
+    store["strkey1"].should == {"hashval1"=>["array1", 1]}
+    sleep 2
+    store["strkey1"].should == nil
+  end
+
+  it 'should support expires on store and load' do
+    store.store("strkey1", {"hashval1"=>["array1", 1]}, :expires => 2)
+    store.load("strkey1").should == {"hashval1"=>["array1", 1]}
+    sleep 1
+    store.load("strkey1").should == {"hashval1"=>["array1", 1]}
+    sleep 2
+    store.load("strkey1").should == nil
+  end
+
+  it 'should support expires on store and key?' do
+    store.store("strkey1", {"hashval1"=>["array1", 1]}, :expires => 2)
+    store.key?("strkey1").should == true
+    sleep 1
+    store.key?("strkey1").should == true
+    sleep 2
+    store.key?("strkey1").should == false
+  end
+
+  it 'should support updating the expiration time in load' do
+    store.store("strkey2", {"hashval3"=>["array2", {"hashval4"=>42}]}, :expires => 2)
+    store["strkey2"].should == {"hashval3"=>["array2", {"hashval4"=>42}]}
+    sleep 1
+    store.load("strkey2", :expires => 3).should == {"hashval3"=>["array2", {"hashval4"=>42}]}
+    store["strkey2"].should == {"hashval3"=>["array2", {"hashval4"=>42}]}
+    sleep 1
+    store["strkey2"].should == {"hashval3"=>["array2", {"hashval4"=>42}]}
+    sleep 3
+    store["strkey2"].should == nil
+  end
+
+  it 'should support updating the expiration time in key?' do
+    store.store("strkey2", {"hashval3"=>["array2", {"hashval4"=>42}]}, :expires => 2)
+    store["strkey2"].should == {"hashval3"=>["array2", {"hashval4"=>42}]}
+    sleep 1
+    store.key?("strkey2", :expires => 3).should be_true
+    store["strkey2"].should == {"hashval3"=>["array2", {"hashval4"=>42}]}
+    sleep 1
+    store["strkey2"].should == {"hashval3"=>["array2", {"hashval4"=>42}]}
+    sleep 3
+    store["strkey2"].should == nil
+  end
+
+  it 'should support updating the expiration time in fetch' do
+    store.store("strkey1", {"hashval1"=>["array1", 1]}, :expires => 2)
+    store["strkey1"].should == {"hashval1"=>["array1", 1]}
+    sleep 1
+    store.fetch("strkey1", nil, :expires => 3).should == {"hashval1"=>["array1", 1]}
+    store["strkey1"].should == {"hashval1"=>["array1", 1]}
+    sleep 1
+    store["strkey1"].should == {"hashval1"=>["array1", 1]}
+    sleep 3
+    store["strkey1"].should == nil
+  end
+
+  it 'should respect expires in delete' do
+    store.store("strkey2", {"hashval3"=>["array2", {"hashval4"=>42}]}, :expires => 2)
+    store["strkey2"].should == {"hashval3"=>["array2", {"hashval4"=>42}]}
+    sleep 1
+    store["strkey2"].should == {"hashval3"=>["array2", {"hashval4"=>42}]}
+    sleep 2
+    store.delete("strkey2").should == nil
+  end
+end
+
 #################### null_stringkey_objectvalue ####################
 
 shared_examples_for 'null_stringkey_objectvalue' do
@@ -239,6 +619,8 @@ shared_examples_for 'store_stringkey_objectvalue' do
   it "returns true from key? if a String key is available" do
     store["strkey1"] = Value.new(:objval1)
     store.key?("strkey1").should == true
+    store["strkey2"] = Value.new(:objval2)
+    store.key?("strkey2").should == true
   end
 
   it "stores Object values with String keys with #store" do
@@ -326,6 +708,18 @@ shared_examples_for 'expires_stringkey_objectvalue' do
     store["strkey2"].should == nil
   end
 
+  it 'should support updating the expiration time in key?' do
+    store.store("strkey2", Value.new(:objval2), :expires => 2)
+    store["strkey2"].should == Value.new(:objval2)
+    sleep 1
+    store.key?("strkey2", :expires => 3).should be_true
+    store["strkey2"].should == Value.new(:objval2)
+    sleep 1
+    store["strkey2"].should == Value.new(:objval2)
+    sleep 3
+    store["strkey2"].should == nil
+  end
+
   it 'should support updating the expiration time in fetch' do
     store.store("strkey1", Value.new(:objval1), :expires => 2)
     store["strkey1"].should == Value.new(:objval1)
@@ -348,42 +742,42 @@ shared_examples_for 'expires_stringkey_objectvalue' do
   end
 end
 
-#################### null_stringkey_hashvalue ####################
+#################### null_objectkey_booleanvalue ####################
 
-shared_examples_for 'null_stringkey_hashvalue' do
-  it "reads from keys that are Strings like a Hash" do
-    store["strkey1"].should == nil
-    store.load("strkey1").should == nil
+shared_examples_for 'null_objectkey_booleanvalue' do
+  it "reads from keys that are Objects like a Hash" do
+    store[Value.new(:objkey1)].should == nil
+    store.load(Value.new(:objkey1)).should == nil
   end
 
-  it "guarantees that the same Hash value is returned when setting a String key" do
-    value = {"hashval1"=>"hashval2"}
-    (store["strkey1"] = value).should equal(value)
+  it "guarantees that the same Boolean value is returned when setting a Object key" do
+    value = true
+    (store[Value.new(:objkey1)] = value).should equal(value)
   end
 
-  it "returns false from key? if a String key is not available" do
-    store.key?("strkey1").should == false
+  it "returns false from key? if a Object key is not available" do
+    store.key?(Value.new(:objkey1)).should == false
   end
 
-  it "returns nil from delete if an element for a String key does not exist" do
-    store.delete("strkey1").should == nil
+  it "returns nil from delete if an element for a Object key does not exist" do
+    store.delete(Value.new(:objkey1)).should == nil
   end
 
-  it "removes all String keys from the store with clear" do
-    store["strkey1"] = {"hashval1"=>"hashval2"}
-    store["strkey2"] = {"hashval3"=>"hashval4"}
+  it "removes all Object keys from the store with clear" do
+    store[Value.new(:objkey1)] = true
+    store[Value.new(:objkey2)] = false
     store.clear.should equal(store)
-    store.key?("strkey1").should_not ==  true
-    store.key?("strkey2").should_not == true
+    store.key?(Value.new(:objkey1)).should_not ==  true
+    store.key?(Value.new(:objkey2)).should_not == true
   end
 
-  it "fetches a String key with a default value with fetch, if the key is not available" do
-    store.fetch("strkey1", {"hashval1"=>"hashval2"}).should == {"hashval1"=>"hashval2"}
+  it "fetches a Object key with a default value with fetch, if the key is not available" do
+    store.fetch(Value.new(:objkey1), true).should == true
   end
 
-  it "fetches a String key with a block with fetch, if the key is not available" do
-    key = "strkey1"
-    value = {"hashval1"=>"hashval2"}
+  it "fetches a Object key with a block with fetch, if the key is not available" do
+    key = Value.new(:objkey1)
+    value = true
     store.fetch(key) do |k|
       k.should equal(key)
       value
@@ -391,134 +785,138 @@ shared_examples_for 'null_stringkey_hashvalue' do
   end
 
   it 'should accept options' do
-    store.key?("strkey1", :option1 => 1).should == false
-    store.load("strkey1", :option2 => 2).should == nil
-    store.fetch("strkey1", 42, :option3 => 3).should == 42
-    store.fetch("strkey1", :option3 => 3) { 42 }.should == 42
-    store.delete("strkey1", :option4 => 4).should == nil
+    store.key?(Value.new(:objkey1), :option1 => 1).should == false
+    store.load(Value.new(:objkey1), :option2 => 2).should == nil
+    store.fetch(Value.new(:objkey1), 42, :option3 => 3).should == 42
+    store.fetch(Value.new(:objkey1), :option3 => 3) { 42 }.should == 42
+    store.delete(Value.new(:objkey1), :option4 => 4).should == nil
     store.clear(:option5 => 5).should equal(store)
-    store.store("strkey1", {"hashval1"=>"hashval2"}, :option6 => 6).should == {"hashval1"=>"hashval2"}
+    store.store(Value.new(:objkey1), true, :option6 => 6).should == true
   end
 end
 
-#################### store_stringkey_hashvalue ####################
+#################### store_objectkey_booleanvalue ####################
 
-shared_examples_for 'store_stringkey_hashvalue' do
-  it "writes Hash values to keys that are Strings like a Hash" do
-    store["strkey1"] = {"hashval1"=>"hashval2"}
-    store["strkey1"].should == {"hashval1"=>"hashval2"}
-    store.load("strkey1").should == {"hashval1"=>"hashval2"}
+shared_examples_for 'store_objectkey_booleanvalue' do
+  it "writes Boolean values to keys that are Objects like a Hash" do
+    store[Value.new(:objkey1)] = true
+    store[Value.new(:objkey1)].should == true
+    store.load(Value.new(:objkey1)).should == true
   end
 
-  it "returns true from key? if a String key is available" do
-    store["strkey1"] = {"hashval1"=>"hashval2"}
-    store.key?("strkey1").should == true
+  it "returns true from key? if a Object key is available" do
+    store[Value.new(:objkey1)] = true
+    store.key?(Value.new(:objkey1)).should == true
+    store[Value.new(:objkey2)] = false
+    store.key?(Value.new(:objkey2)).should == true
   end
 
-  it "stores Hash values with String keys with #store" do
-    value = {"hashval1"=>"hashval2"}
-    store.store("strkey1", value).should equal(value)
-    store["strkey1"].should == {"hashval1"=>"hashval2"}
-    store.load("strkey1").should == {"hashval1"=>"hashval2"}
+  it "stores Boolean values with Object keys with #store" do
+    value = true
+    store.store(Value.new(:objkey1), value).should equal(value)
+    store[Value.new(:objkey1)].should == true
+    store.load(Value.new(:objkey1)).should == true
   end
 
-  it "removes and returns a Hash element with a String key from the backing store via delete if it exists" do
-    store["strkey1"] = {"hashval1"=>"hashval2"}
-    store.delete("strkey1").should == {"hashval1"=>"hashval2"}
-    store.key?("strkey1").should == false
+  it "removes and returns a Boolean element with a Object key from the backing store via delete if it exists" do
+    store[Value.new(:objkey1)] = true
+    store.delete(Value.new(:objkey1)).should == true
+    store.key?(Value.new(:objkey1)).should == false
   end
 
-  it "overwrites existing Hash values with String" do
-    store["strkey1"] = {"hashval1"=>"hashval2"}
-    store["strkey1"].should == {"hashval1"=>"hashval2"}
-    store["strkey1"] = {"hashval3"=>"hashval4"}
-    store["strkey1"].should == {"hashval3"=>"hashval4"}
+  it "overwrites existing Boolean values with Object" do
+    store[Value.new(:objkey1)] = true
+    store[Value.new(:objkey1)].should == true
+    store[Value.new(:objkey1)] = false
+    store[Value.new(:objkey1)].should == false
   end
 
-  it "does not run the block if the String key is available" do
-    store["strkey1"] = {"hashval1"=>"hashval2"}
+  it "does not run the block if the Object key is available" do
+    store[Value.new(:objkey1)] = true
     unaltered = "unaltered"
-    store.fetch("strkey1") { unaltered = "altered" }
+    store.fetch(Value.new(:objkey1)) { unaltered = "altered" }
     unaltered.should == "unaltered"
   end
 
-  it "fetches a String key with a default value with fetch, if the key is available" do
-    store["strkey1"] = {"hashval1"=>"hashval2"}
-    store.fetch("strkey1", {"hashval3"=>"hashval4"}).should == {"hashval1"=>"hashval2"}
-  end
-end
-
-#################### returndifferent_stringkey_hashvalue ####################
-
-shared_examples_for 'returndifferent_stringkey_hashvalue' do
-  it "guarantees that a different Hash value is retrieved from the String key" do
-    value = {"hashval1"=>"hashval2"}
-    store["strkey1"] = {"hashval1"=>"hashval2"}
-    store["strkey1"].should_not be_equal({"hashval1"=>"hashval2"})
+  it "fetches a Object key with a default value with fetch, if the key is available" do
+    store[Value.new(:objkey1)] = true
+    store.fetch(Value.new(:objkey1), false).should == true
   end
 end
 
-#################### expires_stringkey_hashvalue ####################
+#################### expires_objectkey_booleanvalue ####################
 
-shared_examples_for 'expires_stringkey_hashvalue' do
+shared_examples_for 'expires_objectkey_booleanvalue' do
   it 'should support expires on store and #[]' do
-    store.store("strkey1", {"hashval1"=>"hashval2"}, :expires => 2)
-    store["strkey1"].should == {"hashval1"=>"hashval2"}
+    store.store(Value.new(:objkey1), true, :expires => 2)
+    store[Value.new(:objkey1)].should == true
     sleep 1
-    store["strkey1"].should == {"hashval1"=>"hashval2"}
+    store[Value.new(:objkey1)].should == true
     sleep 2
-    store["strkey1"].should == nil
+    store[Value.new(:objkey1)].should == nil
   end
 
   it 'should support expires on store and load' do
-    store.store("strkey1", {"hashval1"=>"hashval2"}, :expires => 2)
-    store.load("strkey1").should == {"hashval1"=>"hashval2"}
+    store.store(Value.new(:objkey1), true, :expires => 2)
+    store.load(Value.new(:objkey1)).should == true
     sleep 1
-    store.load("strkey1").should == {"hashval1"=>"hashval2"}
+    store.load(Value.new(:objkey1)).should == true
     sleep 2
-    store.load("strkey1").should == nil
+    store.load(Value.new(:objkey1)).should == nil
   end
 
   it 'should support expires on store and key?' do
-    store.store("strkey1", {"hashval1"=>"hashval2"}, :expires => 2)
-    store.key?("strkey1").should == true
+    store.store(Value.new(:objkey1), true, :expires => 2)
+    store.key?(Value.new(:objkey1)).should == true
     sleep 1
-    store.key?("strkey1").should == true
+    store.key?(Value.new(:objkey1)).should == true
     sleep 2
-    store.key?("strkey1").should == false
+    store.key?(Value.new(:objkey1)).should == false
   end
 
   it 'should support updating the expiration time in load' do
-    store.store("strkey2", {"hashval3"=>"hashval4"}, :expires => 2)
-    store["strkey2"].should == {"hashval3"=>"hashval4"}
+    store.store(Value.new(:objkey2), false, :expires => 2)
+    store[Value.new(:objkey2)].should == false
     sleep 1
-    store.load("strkey2", :expires => 3).should == {"hashval3"=>"hashval4"}
-    store["strkey2"].should == {"hashval3"=>"hashval4"}
+    store.load(Value.new(:objkey2), :expires => 3).should == false
+    store[Value.new(:objkey2)].should == false
     sleep 1
-    store["strkey2"].should == {"hashval3"=>"hashval4"}
+    store[Value.new(:objkey2)].should == false
     sleep 3
-    store["strkey2"].should == nil
+    store[Value.new(:objkey2)].should == nil
+  end
+
+  it 'should support updating the expiration time in key?' do
+    store.store(Value.new(:objkey2), false, :expires => 2)
+    store[Value.new(:objkey2)].should == false
+    sleep 1
+    store.key?(Value.new(:objkey2), :expires => 3).should be_true
+    store[Value.new(:objkey2)].should == false
+    sleep 1
+    store[Value.new(:objkey2)].should == false
+    sleep 3
+    store[Value.new(:objkey2)].should == nil
   end
 
   it 'should support updating the expiration time in fetch' do
-    store.store("strkey1", {"hashval1"=>"hashval2"}, :expires => 2)
-    store["strkey1"].should == {"hashval1"=>"hashval2"}
+    store.store(Value.new(:objkey1), true, :expires => 2)
+    store[Value.new(:objkey1)].should == true
     sleep 1
-    store.fetch("strkey1", nil, :expires => 3).should == {"hashval1"=>"hashval2"}
-    store["strkey1"].should == {"hashval1"=>"hashval2"}
+    store.fetch(Value.new(:objkey1), nil, :expires => 3).should == true
+    store[Value.new(:objkey1)].should == true
     sleep 1
-    store["strkey1"].should == {"hashval1"=>"hashval2"}
+    store[Value.new(:objkey1)].should == true
     sleep 3
-    store["strkey1"].should == nil
+    store[Value.new(:objkey1)].should == nil
   end
 
   it 'should respect expires in delete' do
-    store.store("strkey2", {"hashval3"=>"hashval4"}, :expires => 2)
-    store["strkey2"].should == {"hashval3"=>"hashval4"}
+    store.store(Value.new(:objkey2), false, :expires => 2)
+    store[Value.new(:objkey2)].should == false
     sleep 1
-    store["strkey2"].should == {"hashval3"=>"hashval4"}
+    store[Value.new(:objkey2)].should == false
     sleep 2
-    store.delete("strkey2").should == nil
+    store.delete(Value.new(:objkey2)).should == nil
   end
 end
 
@@ -587,6 +985,8 @@ shared_examples_for 'store_objectkey_stringvalue' do
   it "returns true from key? if a Object key is available" do
     store[Value.new(:objkey1)] = "strval1"
     store.key?(Value.new(:objkey1)).should == true
+    store[Value.new(:objkey2)] = "strval2"
+    store.key?(Value.new(:objkey2)).should == true
   end
 
   it "stores String values with Object keys with #store" do
@@ -674,6 +1074,18 @@ shared_examples_for 'expires_objectkey_stringvalue' do
     store[Value.new(:objkey2)].should == nil
   end
 
+  it 'should support updating the expiration time in key?' do
+    store.store(Value.new(:objkey2), "strval2", :expires => 2)
+    store[Value.new(:objkey2)].should == "strval2"
+    sleep 1
+    store.key?(Value.new(:objkey2), :expires => 3).should be_true
+    store[Value.new(:objkey2)].should == "strval2"
+    sleep 1
+    store[Value.new(:objkey2)].should == "strval2"
+    sleep 3
+    store[Value.new(:objkey2)].should == nil
+  end
+
   it 'should support updating the expiration time in fetch' do
     store.store(Value.new(:objkey1), "strval1", :expires => 2)
     store[Value.new(:objkey1)].should == "strval1"
@@ -696,6 +1108,194 @@ shared_examples_for 'expires_objectkey_stringvalue' do
   end
 end
 
+#################### null_objectkey_hashvalue ####################
+
+shared_examples_for 'null_objectkey_hashvalue' do
+  it "reads from keys that are Objects like a Hash" do
+    store[Value.new(:objkey1)].should == nil
+    store.load(Value.new(:objkey1)).should == nil
+  end
+
+  it "guarantees that the same Hash value is returned when setting a Object key" do
+    value = {"hashval1"=>["array1", 1]}
+    (store[Value.new(:objkey1)] = value).should equal(value)
+  end
+
+  it "returns false from key? if a Object key is not available" do
+    store.key?(Value.new(:objkey1)).should == false
+  end
+
+  it "returns nil from delete if an element for a Object key does not exist" do
+    store.delete(Value.new(:objkey1)).should == nil
+  end
+
+  it "removes all Object keys from the store with clear" do
+    store[Value.new(:objkey1)] = {"hashval1"=>["array1", 1]}
+    store[Value.new(:objkey2)] = {"hashval3"=>["array2", {"hashval4"=>42}]}
+    store.clear.should equal(store)
+    store.key?(Value.new(:objkey1)).should_not ==  true
+    store.key?(Value.new(:objkey2)).should_not == true
+  end
+
+  it "fetches a Object key with a default value with fetch, if the key is not available" do
+    store.fetch(Value.new(:objkey1), {"hashval1"=>["array1", 1]}).should == {"hashval1"=>["array1", 1]}
+  end
+
+  it "fetches a Object key with a block with fetch, if the key is not available" do
+    key = Value.new(:objkey1)
+    value = {"hashval1"=>["array1", 1]}
+    store.fetch(key) do |k|
+      k.should equal(key)
+      value
+    end.should equal(value)
+  end
+
+  it 'should accept options' do
+    store.key?(Value.new(:objkey1), :option1 => 1).should == false
+    store.load(Value.new(:objkey1), :option2 => 2).should == nil
+    store.fetch(Value.new(:objkey1), 42, :option3 => 3).should == 42
+    store.fetch(Value.new(:objkey1), :option3 => 3) { 42 }.should == 42
+    store.delete(Value.new(:objkey1), :option4 => 4).should == nil
+    store.clear(:option5 => 5).should equal(store)
+    store.store(Value.new(:objkey1), {"hashval1"=>["array1", 1]}, :option6 => 6).should == {"hashval1"=>["array1", 1]}
+  end
+end
+
+#################### store_objectkey_hashvalue ####################
+
+shared_examples_for 'store_objectkey_hashvalue' do
+  it "writes Hash values to keys that are Objects like a Hash" do
+    store[Value.new(:objkey1)] = {"hashval1"=>["array1", 1]}
+    store[Value.new(:objkey1)].should == {"hashval1"=>["array1", 1]}
+    store.load(Value.new(:objkey1)).should == {"hashval1"=>["array1", 1]}
+  end
+
+  it "returns true from key? if a Object key is available" do
+    store[Value.new(:objkey1)] = {"hashval1"=>["array1", 1]}
+    store.key?(Value.new(:objkey1)).should == true
+    store[Value.new(:objkey2)] = {"hashval3"=>["array2", {"hashval4"=>42}]}
+    store.key?(Value.new(:objkey2)).should == true
+  end
+
+  it "stores Hash values with Object keys with #store" do
+    value = {"hashval1"=>["array1", 1]}
+    store.store(Value.new(:objkey1), value).should equal(value)
+    store[Value.new(:objkey1)].should == {"hashval1"=>["array1", 1]}
+    store.load(Value.new(:objkey1)).should == {"hashval1"=>["array1", 1]}
+  end
+
+  it "removes and returns a Hash element with a Object key from the backing store via delete if it exists" do
+    store[Value.new(:objkey1)] = {"hashval1"=>["array1", 1]}
+    store.delete(Value.new(:objkey1)).should == {"hashval1"=>["array1", 1]}
+    store.key?(Value.new(:objkey1)).should == false
+  end
+
+  it "overwrites existing Hash values with Object" do
+    store[Value.new(:objkey1)] = {"hashval1"=>["array1", 1]}
+    store[Value.new(:objkey1)].should == {"hashval1"=>["array1", 1]}
+    store[Value.new(:objkey1)] = {"hashval3"=>["array2", {"hashval4"=>42}]}
+    store[Value.new(:objkey1)].should == {"hashval3"=>["array2", {"hashval4"=>42}]}
+  end
+
+  it "does not run the block if the Object key is available" do
+    store[Value.new(:objkey1)] = {"hashval1"=>["array1", 1]}
+    unaltered = "unaltered"
+    store.fetch(Value.new(:objkey1)) { unaltered = "altered" }
+    unaltered.should == "unaltered"
+  end
+
+  it "fetches a Object key with a default value with fetch, if the key is available" do
+    store[Value.new(:objkey1)] = {"hashval1"=>["array1", 1]}
+    store.fetch(Value.new(:objkey1), {"hashval3"=>["array2", {"hashval4"=>42}]}).should == {"hashval1"=>["array1", 1]}
+  end
+end
+
+#################### returndifferent_objectkey_hashvalue ####################
+
+shared_examples_for 'returndifferent_objectkey_hashvalue' do
+  it "guarantees that a different Hash value is retrieved from the Object key" do
+    value = {"hashval1"=>["array1", 1]}
+    store[Value.new(:objkey1)] = {"hashval1"=>["array1", 1]}
+    store[Value.new(:objkey1)].should_not be_equal({"hashval1"=>["array1", 1]})
+  end
+end
+
+#################### expires_objectkey_hashvalue ####################
+
+shared_examples_for 'expires_objectkey_hashvalue' do
+  it 'should support expires on store and #[]' do
+    store.store(Value.new(:objkey1), {"hashval1"=>["array1", 1]}, :expires => 2)
+    store[Value.new(:objkey1)].should == {"hashval1"=>["array1", 1]}
+    sleep 1
+    store[Value.new(:objkey1)].should == {"hashval1"=>["array1", 1]}
+    sleep 2
+    store[Value.new(:objkey1)].should == nil
+  end
+
+  it 'should support expires on store and load' do
+    store.store(Value.new(:objkey1), {"hashval1"=>["array1", 1]}, :expires => 2)
+    store.load(Value.new(:objkey1)).should == {"hashval1"=>["array1", 1]}
+    sleep 1
+    store.load(Value.new(:objkey1)).should == {"hashval1"=>["array1", 1]}
+    sleep 2
+    store.load(Value.new(:objkey1)).should == nil
+  end
+
+  it 'should support expires on store and key?' do
+    store.store(Value.new(:objkey1), {"hashval1"=>["array1", 1]}, :expires => 2)
+    store.key?(Value.new(:objkey1)).should == true
+    sleep 1
+    store.key?(Value.new(:objkey1)).should == true
+    sleep 2
+    store.key?(Value.new(:objkey1)).should == false
+  end
+
+  it 'should support updating the expiration time in load' do
+    store.store(Value.new(:objkey2), {"hashval3"=>["array2", {"hashval4"=>42}]}, :expires => 2)
+    store[Value.new(:objkey2)].should == {"hashval3"=>["array2", {"hashval4"=>42}]}
+    sleep 1
+    store.load(Value.new(:objkey2), :expires => 3).should == {"hashval3"=>["array2", {"hashval4"=>42}]}
+    store[Value.new(:objkey2)].should == {"hashval3"=>["array2", {"hashval4"=>42}]}
+    sleep 1
+    store[Value.new(:objkey2)].should == {"hashval3"=>["array2", {"hashval4"=>42}]}
+    sleep 3
+    store[Value.new(:objkey2)].should == nil
+  end
+
+  it 'should support updating the expiration time in key?' do
+    store.store(Value.new(:objkey2), {"hashval3"=>["array2", {"hashval4"=>42}]}, :expires => 2)
+    store[Value.new(:objkey2)].should == {"hashval3"=>["array2", {"hashval4"=>42}]}
+    sleep 1
+    store.key?(Value.new(:objkey2), :expires => 3).should be_true
+    store[Value.new(:objkey2)].should == {"hashval3"=>["array2", {"hashval4"=>42}]}
+    sleep 1
+    store[Value.new(:objkey2)].should == {"hashval3"=>["array2", {"hashval4"=>42}]}
+    sleep 3
+    store[Value.new(:objkey2)].should == nil
+  end
+
+  it 'should support updating the expiration time in fetch' do
+    store.store(Value.new(:objkey1), {"hashval1"=>["array1", 1]}, :expires => 2)
+    store[Value.new(:objkey1)].should == {"hashval1"=>["array1", 1]}
+    sleep 1
+    store.fetch(Value.new(:objkey1), nil, :expires => 3).should == {"hashval1"=>["array1", 1]}
+    store[Value.new(:objkey1)].should == {"hashval1"=>["array1", 1]}
+    sleep 1
+    store[Value.new(:objkey1)].should == {"hashval1"=>["array1", 1]}
+    sleep 3
+    store[Value.new(:objkey1)].should == nil
+  end
+
+  it 'should respect expires in delete' do
+    store.store(Value.new(:objkey2), {"hashval3"=>["array2", {"hashval4"=>42}]}, :expires => 2)
+    store[Value.new(:objkey2)].should == {"hashval3"=>["array2", {"hashval4"=>42}]}
+    sleep 1
+    store[Value.new(:objkey2)].should == {"hashval3"=>["array2", {"hashval4"=>42}]}
+    sleep 2
+    store.delete(Value.new(:objkey2)).should == nil
+  end
+end
+
 #################### null_objectkey_objectvalue ####################
 
 shared_examples_for 'null_objectkey_objectvalue' do
@@ -761,6 +1361,8 @@ shared_examples_for 'store_objectkey_objectvalue' do
   it "returns true from key? if a Object key is available" do
     store[Value.new(:objkey1)] = Value.new(:objval1)
     store.key?(Value.new(:objkey1)).should == true
+    store[Value.new(:objkey2)] = Value.new(:objval2)
+    store.key?(Value.new(:objkey2)).should == true
   end
 
   it "stores Object values with Object keys with #store" do
@@ -848,6 +1450,18 @@ shared_examples_for 'expires_objectkey_objectvalue' do
     store[Value.new(:objkey2)].should == nil
   end
 
+  it 'should support updating the expiration time in key?' do
+    store.store(Value.new(:objkey2), Value.new(:objval2), :expires => 2)
+    store[Value.new(:objkey2)].should == Value.new(:objval2)
+    sleep 1
+    store.key?(Value.new(:objkey2), :expires => 3).should be_true
+    store[Value.new(:objkey2)].should == Value.new(:objval2)
+    sleep 1
+    store[Value.new(:objkey2)].should == Value.new(:objval2)
+    sleep 3
+    store[Value.new(:objkey2)].should == nil
+  end
+
   it 'should support updating the expiration time in fetch' do
     store.store(Value.new(:objkey1), Value.new(:objval1), :expires => 2)
     store[Value.new(:objkey1)].should == Value.new(:objval1)
@@ -870,42 +1484,42 @@ shared_examples_for 'expires_objectkey_objectvalue' do
   end
 end
 
-#################### null_objectkey_hashvalue ####################
+#################### null_hashkey_booleanvalue ####################
 
-shared_examples_for 'null_objectkey_hashvalue' do
-  it "reads from keys that are Objects like a Hash" do
-    store[Value.new(:objkey1)].should == nil
-    store.load(Value.new(:objkey1)).should == nil
+shared_examples_for 'null_hashkey_booleanvalue' do
+  it "reads from keys that are Hashs like a Hash" do
+    store[{"hashkey1"=>"hashkey2"}].should == nil
+    store.load({"hashkey1"=>"hashkey2"}).should == nil
   end
 
-  it "guarantees that the same Hash value is returned when setting a Object key" do
-    value = {"hashval1"=>"hashval2"}
-    (store[Value.new(:objkey1)] = value).should equal(value)
+  it "guarantees that the same Boolean value is returned when setting a Hash key" do
+    value = true
+    (store[{"hashkey1"=>"hashkey2"}] = value).should equal(value)
   end
 
-  it "returns false from key? if a Object key is not available" do
-    store.key?(Value.new(:objkey1)).should == false
+  it "returns false from key? if a Hash key is not available" do
+    store.key?({"hashkey1"=>"hashkey2"}).should == false
   end
-
-  it "returns nil from delete if an element for a Object key does not exist" do
-    store.delete(Value.new(:objkey1)).should == nil
+
+  it "returns nil from delete if an element for a Hash key does not exist" do
+    store.delete({"hashkey1"=>"hashkey2"}).should == nil
   end
 
-  it "removes all Object keys from the store with clear" do
-    store[Value.new(:objkey1)] = {"hashval1"=>"hashval2"}
-    store[Value.new(:objkey2)] = {"hashval3"=>"hashval4"}
+  it "removes all Hash keys from the store with clear" do
+    store[{"hashkey1"=>"hashkey2"}] = true
+    store[{"hashkey3"=>"hashkey4"}] = false
     store.clear.should equal(store)
-    store.key?(Value.new(:objkey1)).should_not ==  true
-    store.key?(Value.new(:objkey2)).should_not == true
+    store.key?({"hashkey1"=>"hashkey2"}).should_not ==  true
+    store.key?({"hashkey3"=>"hashkey4"}).should_not == true
   end
 
-  it "fetches a Object key with a default value with fetch, if the key is not available" do
-    store.fetch(Value.new(:objkey1), {"hashval1"=>"hashval2"}).should == {"hashval1"=>"hashval2"}
+  it "fetches a Hash key with a default value with fetch, if the key is not available" do
+    store.fetch({"hashkey1"=>"hashkey2"}, true).should == true
   end
 
-  it "fetches a Object key with a block with fetch, if the key is not available" do
-    key = Value.new(:objkey1)
-    value = {"hashval1"=>"hashval2"}
+  it "fetches a Hash key with a block with fetch, if the key is not available" do
+    key = {"hashkey1"=>"hashkey2"}
+    value = true
     store.fetch(key) do |k|
       k.should equal(key)
       value
@@ -913,134 +1527,138 @@ shared_examples_for 'null_objectkey_hashvalue' do
   end
 
   it 'should accept options' do
-    store.key?(Value.new(:objkey1), :option1 => 1).should == false
-    store.load(Value.new(:objkey1), :option2 => 2).should == nil
-    store.fetch(Value.new(:objkey1), 42, :option3 => 3).should == 42
-    store.fetch(Value.new(:objkey1), :option3 => 3) { 42 }.should == 42
-    store.delete(Value.new(:objkey1), :option4 => 4).should == nil
+    store.key?({"hashkey1"=>"hashkey2"}, :option1 => 1).should == false
+    store.load({"hashkey1"=>"hashkey2"}, :option2 => 2).should == nil
+    store.fetch({"hashkey1"=>"hashkey2"}, 42, :option3 => 3).should == 42
+    store.fetch({"hashkey1"=>"hashkey2"}, :option3 => 3) { 42 }.should == 42
+    store.delete({"hashkey1"=>"hashkey2"}, :option4 => 4).should == nil
     store.clear(:option5 => 5).should equal(store)
-    store.store(Value.new(:objkey1), {"hashval1"=>"hashval2"}, :option6 => 6).should == {"hashval1"=>"hashval2"}
+    store.store({"hashkey1"=>"hashkey2"}, true, :option6 => 6).should == true
   end
 end
 
-#################### store_objectkey_hashvalue ####################
+#################### store_hashkey_booleanvalue ####################
 
-shared_examples_for 'store_objectkey_hashvalue' do
-  it "writes Hash values to keys that are Objects like a Hash" do
-    store[Value.new(:objkey1)] = {"hashval1"=>"hashval2"}
-    store[Value.new(:objkey1)].should == {"hashval1"=>"hashval2"}
-    store.load(Value.new(:objkey1)).should == {"hashval1"=>"hashval2"}
+shared_examples_for 'store_hashkey_booleanvalue' do
+  it "writes Boolean values to keys that are Hashs like a Hash" do
+    store[{"hashkey1"=>"hashkey2"}] = true
+    store[{"hashkey1"=>"hashkey2"}].should == true
+    store.load({"hashkey1"=>"hashkey2"}).should == true
   end
 
-  it "returns true from key? if a Object key is available" do
-    store[Value.new(:objkey1)] = {"hashval1"=>"hashval2"}
-    store.key?(Value.new(:objkey1)).should == true
+  it "returns true from key? if a Hash key is available" do
+    store[{"hashkey1"=>"hashkey2"}] = true
+    store.key?({"hashkey1"=>"hashkey2"}).should == true
+    store[{"hashkey3"=>"hashkey4"}] = false
+    store.key?({"hashkey3"=>"hashkey4"}).should == true
   end
 
-  it "stores Hash values with Object keys with #store" do
-    value = {"hashval1"=>"hashval2"}
-    store.store(Value.new(:objkey1), value).should equal(value)
-    store[Value.new(:objkey1)].should == {"hashval1"=>"hashval2"}
-    store.load(Value.new(:objkey1)).should == {"hashval1"=>"hashval2"}
+  it "stores Boolean values with Hash keys with #store" do
+    value = true
+    store.store({"hashkey1"=>"hashkey2"}, value).should equal(value)
+    store[{"hashkey1"=>"hashkey2"}].should == true
+    store.load({"hashkey1"=>"hashkey2"}).should == true
   end
 
-  it "removes and returns a Hash element with a Object key from the backing store via delete if it exists" do
-    store[Value.new(:objkey1)] = {"hashval1"=>"hashval2"}
-    store.delete(Value.new(:objkey1)).should == {"hashval1"=>"hashval2"}
-    store.key?(Value.new(:objkey1)).should == false
+  it "removes and returns a Boolean element with a Hash key from the backing store via delete if it exists" do
+    store[{"hashkey1"=>"hashkey2"}] = true
+    store.delete({"hashkey1"=>"hashkey2"}).should == true
+    store.key?({"hashkey1"=>"hashkey2"}).should == false
   end
 
-  it "overwrites existing Hash values with Object" do
-    store[Value.new(:objkey1)] = {"hashval1"=>"hashval2"}
-    store[Value.new(:objkey1)].should == {"hashval1"=>"hashval2"}
-    store[Value.new(:objkey1)] = {"hashval3"=>"hashval4"}
-    store[Value.new(:objkey1)].should == {"hashval3"=>"hashval4"}
+  it "overwrites existing Boolean values with Hash" do
+    store[{"hashkey1"=>"hashkey2"}] = true
+    store[{"hashkey1"=>"hashkey2"}].should == true
+    store[{"hashkey1"=>"hashkey2"}] = false
+    store[{"hashkey1"=>"hashkey2"}].should == false
   end
 
-  it "does not run the block if the Object key is available" do
-    store[Value.new(:objkey1)] = {"hashval1"=>"hashval2"}
+  it "does not run the block if the Hash key is available" do
+    store[{"hashkey1"=>"hashkey2"}] = true
     unaltered = "unaltered"
-    store.fetch(Value.new(:objkey1)) { unaltered = "altered" }
+    store.fetch({"hashkey1"=>"hashkey2"}) { unaltered = "altered" }
     unaltered.should == "unaltered"
   end
 
-  it "fetches a Object key with a default value with fetch, if the key is available" do
-    store[Value.new(:objkey1)] = {"hashval1"=>"hashval2"}
-    store.fetch(Value.new(:objkey1), {"hashval3"=>"hashval4"}).should == {"hashval1"=>"hashval2"}
-  end
-end
-
-#################### returndifferent_objectkey_hashvalue ####################
-
-shared_examples_for 'returndifferent_objectkey_hashvalue' do
-  it "guarantees that a different Hash value is retrieved from the Object key" do
-    value = {"hashval1"=>"hashval2"}
-    store[Value.new(:objkey1)] = {"hashval1"=>"hashval2"}
-    store[Value.new(:objkey1)].should_not be_equal({"hashval1"=>"hashval2"})
+  it "fetches a Hash key with a default value with fetch, if the key is available" do
+    store[{"hashkey1"=>"hashkey2"}] = true
+    store.fetch({"hashkey1"=>"hashkey2"}, false).should == true
   end
 end
 
-#################### expires_objectkey_hashvalue ####################
+#################### expires_hashkey_booleanvalue ####################
 
-shared_examples_for 'expires_objectkey_hashvalue' do
+shared_examples_for 'expires_hashkey_booleanvalue' do
   it 'should support expires on store and #[]' do
-    store.store(Value.new(:objkey1), {"hashval1"=>"hashval2"}, :expires => 2)
-    store[Value.new(:objkey1)].should == {"hashval1"=>"hashval2"}
+    store.store({"hashkey1"=>"hashkey2"}, true, :expires => 2)
+    store[{"hashkey1"=>"hashkey2"}].should == true
     sleep 1
-    store[Value.new(:objkey1)].should == {"hashval1"=>"hashval2"}
+    store[{"hashkey1"=>"hashkey2"}].should == true
     sleep 2
-    store[Value.new(:objkey1)].should == nil
+    store[{"hashkey1"=>"hashkey2"}].should == nil
   end
 
   it 'should support expires on store and load' do
-    store.store(Value.new(:objkey1), {"hashval1"=>"hashval2"}, :expires => 2)
-    store.load(Value.new(:objkey1)).should == {"hashval1"=>"hashval2"}
+    store.store({"hashkey1"=>"hashkey2"}, true, :expires => 2)
+    store.load({"hashkey1"=>"hashkey2"}).should == true
     sleep 1
-    store.load(Value.new(:objkey1)).should == {"hashval1"=>"hashval2"}
+    store.load({"hashkey1"=>"hashkey2"}).should == true
     sleep 2
-    store.load(Value.new(:objkey1)).should == nil
+    store.load({"hashkey1"=>"hashkey2"}).should == nil
   end
 
   it 'should support expires on store and key?' do
-    store.store(Value.new(:objkey1), {"hashval1"=>"hashval2"}, :expires => 2)
-    store.key?(Value.new(:objkey1)).should == true
+    store.store({"hashkey1"=>"hashkey2"}, true, :expires => 2)
+    store.key?({"hashkey1"=>"hashkey2"}).should == true
     sleep 1
-    store.key?(Value.new(:objkey1)).should == true
+    store.key?({"hashkey1"=>"hashkey2"}).should == true
     sleep 2
-    store.key?(Value.new(:objkey1)).should == false
+    store.key?({"hashkey1"=>"hashkey2"}).should == false
   end
 
   it 'should support updating the expiration time in load' do
-    store.store(Value.new(:objkey2), {"hashval3"=>"hashval4"}, :expires => 2)
-    store[Value.new(:objkey2)].should == {"hashval3"=>"hashval4"}
+    store.store({"hashkey3"=>"hashkey4"}, false, :expires => 2)
+    store[{"hashkey3"=>"hashkey4"}].should == false
     sleep 1
-    store.load(Value.new(:objkey2), :expires => 3).should == {"hashval3"=>"hashval4"}
-    store[Value.new(:objkey2)].should == {"hashval3"=>"hashval4"}
+    store.load({"hashkey3"=>"hashkey4"}, :expires => 3).should == false
+    store[{"hashkey3"=>"hashkey4"}].should == false
     sleep 1
-    store[Value.new(:objkey2)].should == {"hashval3"=>"hashval4"}
+    store[{"hashkey3"=>"hashkey4"}].should == false
     sleep 3
-    store[Value.new(:objkey2)].should == nil
+    store[{"hashkey3"=>"hashkey4"}].should == nil
+  end
+
+  it 'should support updating the expiration time in key?' do
+    store.store({"hashkey3"=>"hashkey4"}, false, :expires => 2)
+    store[{"hashkey3"=>"hashkey4"}].should == false
+    sleep 1
+    store.key?({"hashkey3"=>"hashkey4"}, :expires => 3).should be_true
+    store[{"hashkey3"=>"hashkey4"}].should == false
+    sleep 1
+    store[{"hashkey3"=>"hashkey4"}].should == false
+    sleep 3
+    store[{"hashkey3"=>"hashkey4"}].should == nil
   end
 
   it 'should support updating the expiration time in fetch' do
-    store.store(Value.new(:objkey1), {"hashval1"=>"hashval2"}, :expires => 2)
-    store[Value.new(:objkey1)].should == {"hashval1"=>"hashval2"}
+    store.store({"hashkey1"=>"hashkey2"}, true, :expires => 2)
+    store[{"hashkey1"=>"hashkey2"}].should == true
     sleep 1
-    store.fetch(Value.new(:objkey1), nil, :expires => 3).should == {"hashval1"=>"hashval2"}
-    store[Value.new(:objkey1)].should == {"hashval1"=>"hashval2"}
+    store.fetch({"hashkey1"=>"hashkey2"}, nil, :expires => 3).should == true
+    store[{"hashkey1"=>"hashkey2"}].should == true
     sleep 1
-    store[Value.new(:objkey1)].should == {"hashval1"=>"hashval2"}
+    store[{"hashkey1"=>"hashkey2"}].should == true
     sleep 3
-    store[Value.new(:objkey1)].should == nil
+    store[{"hashkey1"=>"hashkey2"}].should == nil
   end
 
   it 'should respect expires in delete' do
-    store.store(Value.new(:objkey2), {"hashval3"=>"hashval4"}, :expires => 2)
-    store[Value.new(:objkey2)].should == {"hashval3"=>"hashval4"}
+    store.store({"hashkey3"=>"hashkey4"}, false, :expires => 2)
+    store[{"hashkey3"=>"hashkey4"}].should == false
     sleep 1
-    store[Value.new(:objkey2)].should == {"hashval3"=>"hashval4"}
+    store[{"hashkey3"=>"hashkey4"}].should == false
     sleep 2
-    store.delete(Value.new(:objkey2)).should == nil
+    store.delete({"hashkey3"=>"hashkey4"}).should == nil
   end
 end
 
@@ -1109,6 +1727,8 @@ shared_examples_for 'store_hashkey_stringvalue' do
   it "returns true from key? if a Hash key is available" do
     store[{"hashkey1"=>"hashkey2"}] = "strval1"
     store.key?({"hashkey1"=>"hashkey2"}).should == true
+    store[{"hashkey3"=>"hashkey4"}] = "strval2"
+    store.key?({"hashkey3"=>"hashkey4"}).should == true
   end
 
   it "stores String values with Hash keys with #store" do
@@ -1196,6 +1816,18 @@ shared_examples_for 'expires_hashkey_stringvalue' do
     store[{"hashkey3"=>"hashkey4"}].should == nil
   end
 
+  it 'should support updating the expiration time in key?' do
+    store.store({"hashkey3"=>"hashkey4"}, "strval2", :expires => 2)
+    store[{"hashkey3"=>"hashkey4"}].should == "strval2"
+    sleep 1
+    store.key?({"hashkey3"=>"hashkey4"}, :expires => 3).should be_true
+    store[{"hashkey3"=>"hashkey4"}].should == "strval2"
+    sleep 1
+    store[{"hashkey3"=>"hashkey4"}].should == "strval2"
+    sleep 3
+    store[{"hashkey3"=>"hashkey4"}].should == nil
+  end
+
   it 'should support updating the expiration time in fetch' do
     store.store({"hashkey1"=>"hashkey2"}, "strval1", :expires => 2)
     store[{"hashkey1"=>"hashkey2"}].should == "strval1"
@@ -1218,16 +1850,16 @@ shared_examples_for 'expires_hashkey_stringvalue' do
   end
 end
 
-#################### null_hashkey_objectvalue ####################
+#################### null_hashkey_hashvalue ####################
 
-shared_examples_for 'null_hashkey_objectvalue' do
+shared_examples_for 'null_hashkey_hashvalue' do
   it "reads from keys that are Hashs like a Hash" do
     store[{"hashkey1"=>"hashkey2"}].should == nil
     store.load({"hashkey1"=>"hashkey2"}).should == nil
   end
 
-  it "guarantees that the same Object value is returned when setting a Hash key" do
-    value = Value.new(:objval1)
+  it "guarantees that the same Hash value is returned when setting a Hash key" do
+    value = {"hashval1"=>["array1", 1]}
     (store[{"hashkey1"=>"hashkey2"}] = value).should equal(value)
   end
 
@@ -1240,20 +1872,20 @@ shared_examples_for 'null_hashkey_objectvalue' do
   end
 
   it "removes all Hash keys from the store with clear" do
-    store[{"hashkey1"=>"hashkey2"}] = Value.new(:objval1)
-    store[{"hashkey3"=>"hashkey4"}] = Value.new(:objval2)
+    store[{"hashkey1"=>"hashkey2"}] = {"hashval1"=>["array1", 1]}
+    store[{"hashkey3"=>"hashkey4"}] = {"hashval3"=>["array2", {"hashval4"=>42}]}
     store.clear.should equal(store)
     store.key?({"hashkey1"=>"hashkey2"}).should_not ==  true
     store.key?({"hashkey3"=>"hashkey4"}).should_not == true
   end
 
   it "fetches a Hash key with a default value with fetch, if the key is not available" do
-    store.fetch({"hashkey1"=>"hashkey2"}, Value.new(:objval1)).should == Value.new(:objval1)
+    store.fetch({"hashkey1"=>"hashkey2"}, {"hashval1"=>["array1", 1]}).should == {"hashval1"=>["array1", 1]}
   end
 
   it "fetches a Hash key with a block with fetch, if the key is not available" do
     key = {"hashkey1"=>"hashkey2"}
-    value = Value.new(:objval1)
+    value = {"hashval1"=>["array1", 1]}
     store.fetch(key) do |k|
       k.should equal(key)
       value
@@ -1267,90 +1899,92 @@ shared_examples_for 'null_hashkey_objectvalue' do
     store.fetch({"hashkey1"=>"hashkey2"}, :option3 => 3) { 42 }.should == 42
     store.delete({"hashkey1"=>"hashkey2"}, :option4 => 4).should == nil
     store.clear(:option5 => 5).should equal(store)
-    store.store({"hashkey1"=>"hashkey2"}, Value.new(:objval1), :option6 => 6).should == Value.new(:objval1)
+    store.store({"hashkey1"=>"hashkey2"}, {"hashval1"=>["array1", 1]}, :option6 => 6).should == {"hashval1"=>["array1", 1]}
   end
 end
 
-#################### store_hashkey_objectvalue ####################
+#################### store_hashkey_hashvalue ####################
 
-shared_examples_for 'store_hashkey_objectvalue' do
-  it "writes Object values to keys that are Hashs like a Hash" do
-    store[{"hashkey1"=>"hashkey2"}] = Value.new(:objval1)
-    store[{"hashkey1"=>"hashkey2"}].should == Value.new(:objval1)
-    store.load({"hashkey1"=>"hashkey2"}).should == Value.new(:objval1)
+shared_examples_for 'store_hashkey_hashvalue' do
+  it "writes Hash values to keys that are Hashs like a Hash" do
+    store[{"hashkey1"=>"hashkey2"}] = {"hashval1"=>["array1", 1]}
+    store[{"hashkey1"=>"hashkey2"}].should == {"hashval1"=>["array1", 1]}
+    store.load({"hashkey1"=>"hashkey2"}).should == {"hashval1"=>["array1", 1]}
   end
 
   it "returns true from key? if a Hash key is available" do
-    store[{"hashkey1"=>"hashkey2"}] = Value.new(:objval1)
+    store[{"hashkey1"=>"hashkey2"}] = {"hashval1"=>["array1", 1]}
     store.key?({"hashkey1"=>"hashkey2"}).should == true
+    store[{"hashkey3"=>"hashkey4"}] = {"hashval3"=>["array2", {"hashval4"=>42}]}
+    store.key?({"hashkey3"=>"hashkey4"}).should == true
   end
 
-  it "stores Object values with Hash keys with #store" do
-    value = Value.new(:objval1)
+  it "stores Hash values with Hash keys with #store" do
+    value = {"hashval1"=>["array1", 1]}
     store.store({"hashkey1"=>"hashkey2"}, value).should equal(value)
-    store[{"hashkey1"=>"hashkey2"}].should == Value.new(:objval1)
-    store.load({"hashkey1"=>"hashkey2"}).should == Value.new(:objval1)
+    store[{"hashkey1"=>"hashkey2"}].should == {"hashval1"=>["array1", 1]}
+    store.load({"hashkey1"=>"hashkey2"}).should == {"hashval1"=>["array1", 1]}
   end
 
-  it "removes and returns a Object element with a Hash key from the backing store via delete if it exists" do
-    store[{"hashkey1"=>"hashkey2"}] = Value.new(:objval1)
-    store.delete({"hashkey1"=>"hashkey2"}).should == Value.new(:objval1)
+  it "removes and returns a Hash element with a Hash key from the backing store via delete if it exists" do
+    store[{"hashkey1"=>"hashkey2"}] = {"hashval1"=>["array1", 1]}
+    store.delete({"hashkey1"=>"hashkey2"}).should == {"hashval1"=>["array1", 1]}
     store.key?({"hashkey1"=>"hashkey2"}).should == false
   end
 
-  it "overwrites existing Object values with Hash" do
-    store[{"hashkey1"=>"hashkey2"}] = Value.new(:objval1)
-    store[{"hashkey1"=>"hashkey2"}].should == Value.new(:objval1)
-    store[{"hashkey1"=>"hashkey2"}] = Value.new(:objval2)
-    store[{"hashkey1"=>"hashkey2"}].should == Value.new(:objval2)
+  it "overwrites existing Hash values with Hash" do
+    store[{"hashkey1"=>"hashkey2"}] = {"hashval1"=>["array1", 1]}
+    store[{"hashkey1"=>"hashkey2"}].should == {"hashval1"=>["array1", 1]}
+    store[{"hashkey1"=>"hashkey2"}] = {"hashval3"=>["array2", {"hashval4"=>42}]}
+    store[{"hashkey1"=>"hashkey2"}].should == {"hashval3"=>["array2", {"hashval4"=>42}]}
   end
 
   it "does not run the block if the Hash key is available" do
-    store[{"hashkey1"=>"hashkey2"}] = Value.new(:objval1)
+    store[{"hashkey1"=>"hashkey2"}] = {"hashval1"=>["array1", 1]}
     unaltered = "unaltered"
     store.fetch({"hashkey1"=>"hashkey2"}) { unaltered = "altered" }
     unaltered.should == "unaltered"
   end
 
   it "fetches a Hash key with a default value with fetch, if the key is available" do
-    store[{"hashkey1"=>"hashkey2"}] = Value.new(:objval1)
-    store.fetch({"hashkey1"=>"hashkey2"}, Value.new(:objval2)).should == Value.new(:objval1)
+    store[{"hashkey1"=>"hashkey2"}] = {"hashval1"=>["array1", 1]}
+    store.fetch({"hashkey1"=>"hashkey2"}, {"hashval3"=>["array2", {"hashval4"=>42}]}).should == {"hashval1"=>["array1", 1]}
   end
 end
 
-#################### returndifferent_hashkey_objectvalue ####################
+#################### returndifferent_hashkey_hashvalue ####################
 
-shared_examples_for 'returndifferent_hashkey_objectvalue' do
-  it "guarantees that a different Object value is retrieved from the Hash key" do
-    value = Value.new(:objval1)
-    store[{"hashkey1"=>"hashkey2"}] = Value.new(:objval1)
-    store[{"hashkey1"=>"hashkey2"}].should_not be_equal(Value.new(:objval1))
+shared_examples_for 'returndifferent_hashkey_hashvalue' do
+  it "guarantees that a different Hash value is retrieved from the Hash key" do
+    value = {"hashval1"=>["array1", 1]}
+    store[{"hashkey1"=>"hashkey2"}] = {"hashval1"=>["array1", 1]}
+    store[{"hashkey1"=>"hashkey2"}].should_not be_equal({"hashval1"=>["array1", 1]})
   end
 end
 
-#################### expires_hashkey_objectvalue ####################
+#################### expires_hashkey_hashvalue ####################
 
-shared_examples_for 'expires_hashkey_objectvalue' do
+shared_examples_for 'expires_hashkey_hashvalue' do
   it 'should support expires on store and #[]' do
-    store.store({"hashkey1"=>"hashkey2"}, Value.new(:objval1), :expires => 2)
-    store[{"hashkey1"=>"hashkey2"}].should == Value.new(:objval1)
+    store.store({"hashkey1"=>"hashkey2"}, {"hashval1"=>["array1", 1]}, :expires => 2)
+    store[{"hashkey1"=>"hashkey2"}].should == {"hashval1"=>["array1", 1]}
     sleep 1
-    store[{"hashkey1"=>"hashkey2"}].should == Value.new(:objval1)
+    store[{"hashkey1"=>"hashkey2"}].should == {"hashval1"=>["array1", 1]}
     sleep 2
     store[{"hashkey1"=>"hashkey2"}].should == nil
   end
 
   it 'should support expires on store and load' do
-    store.store({"hashkey1"=>"hashkey2"}, Value.new(:objval1), :expires => 2)
-    store.load({"hashkey1"=>"hashkey2"}).should == Value.new(:objval1)
+    store.store({"hashkey1"=>"hashkey2"}, {"hashval1"=>["array1", 1]}, :expires => 2)
+    store.load({"hashkey1"=>"hashkey2"}).should == {"hashval1"=>["array1", 1]}
     sleep 1
-    store.load({"hashkey1"=>"hashkey2"}).should == Value.new(:objval1)
+    store.load({"hashkey1"=>"hashkey2"}).should == {"hashval1"=>["array1", 1]}
     sleep 2
     store.load({"hashkey1"=>"hashkey2"}).should == nil
   end
 
   it 'should support expires on store and key?' do
-    store.store({"hashkey1"=>"hashkey2"}, Value.new(:objval1), :expires => 2)
+    store.store({"hashkey1"=>"hashkey2"}, {"hashval1"=>["array1", 1]}, :expires => 2)
     store.key?({"hashkey1"=>"hashkey2"}).should == true
     sleep 1
     store.key?({"hashkey1"=>"hashkey2"}).should == true
@@ -1359,49 +1993,61 @@ shared_examples_for 'expires_hashkey_objectvalue' do
   end
 
   it 'should support updating the expiration time in load' do
-    store.store({"hashkey3"=>"hashkey4"}, Value.new(:objval2), :expires => 2)
-    store[{"hashkey3"=>"hashkey4"}].should == Value.new(:objval2)
+    store.store({"hashkey3"=>"hashkey4"}, {"hashval3"=>["array2", {"hashval4"=>42}]}, :expires => 2)
+    store[{"hashkey3"=>"hashkey4"}].should == {"hashval3"=>["array2", {"hashval4"=>42}]}
     sleep 1
-    store.load({"hashkey3"=>"hashkey4"}, :expires => 3).should == Value.new(:objval2)
-    store[{"hashkey3"=>"hashkey4"}].should == Value.new(:objval2)
+    store.load({"hashkey3"=>"hashkey4"}, :expires => 3).should == {"hashval3"=>["array2", {"hashval4"=>42}]}
+    store[{"hashkey3"=>"hashkey4"}].should == {"hashval3"=>["array2", {"hashval4"=>42}]}
     sleep 1
-    store[{"hashkey3"=>"hashkey4"}].should == Value.new(:objval2)
+    store[{"hashkey3"=>"hashkey4"}].should == {"hashval3"=>["array2", {"hashval4"=>42}]}
+    sleep 3
+    store[{"hashkey3"=>"hashkey4"}].should == nil
+  end
+
+  it 'should support updating the expiration time in key?' do
+    store.store({"hashkey3"=>"hashkey4"}, {"hashval3"=>["array2", {"hashval4"=>42}]}, :expires => 2)
+    store[{"hashkey3"=>"hashkey4"}].should == {"hashval3"=>["array2", {"hashval4"=>42}]}
+    sleep 1
+    store.key?({"hashkey3"=>"hashkey4"}, :expires => 3).should be_true
+    store[{"hashkey3"=>"hashkey4"}].should == {"hashval3"=>["array2", {"hashval4"=>42}]}
+    sleep 1
+    store[{"hashkey3"=>"hashkey4"}].should == {"hashval3"=>["array2", {"hashval4"=>42}]}
     sleep 3
     store[{"hashkey3"=>"hashkey4"}].should == nil
   end
 
   it 'should support updating the expiration time in fetch' do
-    store.store({"hashkey1"=>"hashkey2"}, Value.new(:objval1), :expires => 2)
-    store[{"hashkey1"=>"hashkey2"}].should == Value.new(:objval1)
+    store.store({"hashkey1"=>"hashkey2"}, {"hashval1"=>["array1", 1]}, :expires => 2)
+    store[{"hashkey1"=>"hashkey2"}].should == {"hashval1"=>["array1", 1]}
     sleep 1
-    store.fetch({"hashkey1"=>"hashkey2"}, nil, :expires => 3).should == Value.new(:objval1)
-    store[{"hashkey1"=>"hashkey2"}].should == Value.new(:objval1)
+    store.fetch({"hashkey1"=>"hashkey2"}, nil, :expires => 3).should == {"hashval1"=>["array1", 1]}
+    store[{"hashkey1"=>"hashkey2"}].should == {"hashval1"=>["array1", 1]}
     sleep 1
-    store[{"hashkey1"=>"hashkey2"}].should == Value.new(:objval1)
+    store[{"hashkey1"=>"hashkey2"}].should == {"hashval1"=>["array1", 1]}
     sleep 3
     store[{"hashkey1"=>"hashkey2"}].should == nil
   end
 
   it 'should respect expires in delete' do
-    store.store({"hashkey3"=>"hashkey4"}, Value.new(:objval2), :expires => 2)
-    store[{"hashkey3"=>"hashkey4"}].should == Value.new(:objval2)
+    store.store({"hashkey3"=>"hashkey4"}, {"hashval3"=>["array2", {"hashval4"=>42}]}, :expires => 2)
+    store[{"hashkey3"=>"hashkey4"}].should == {"hashval3"=>["array2", {"hashval4"=>42}]}
     sleep 1
-    store[{"hashkey3"=>"hashkey4"}].should == Value.new(:objval2)
+    store[{"hashkey3"=>"hashkey4"}].should == {"hashval3"=>["array2", {"hashval4"=>42}]}
     sleep 2
     store.delete({"hashkey3"=>"hashkey4"}).should == nil
   end
 end
 
-#################### null_hashkey_hashvalue ####################
+#################### null_hashkey_objectvalue ####################
 
-shared_examples_for 'null_hashkey_hashvalue' do
+shared_examples_for 'null_hashkey_objectvalue' do
   it "reads from keys that are Hashs like a Hash" do
     store[{"hashkey1"=>"hashkey2"}].should == nil
     store.load({"hashkey1"=>"hashkey2"}).should == nil
   end
 
-  it "guarantees that the same Hash value is returned when setting a Hash key" do
-    value = {"hashval1"=>"hashval2"}
+  it "guarantees that the same Object value is returned when setting a Hash key" do
+    value = Value.new(:objval1)
     (store[{"hashkey1"=>"hashkey2"}] = value).should equal(value)
   end
 
@@ -1414,20 +2060,20 @@ shared_examples_for 'null_hashkey_hashvalue' do
   end
 
   it "removes all Hash keys from the store with clear" do
-    store[{"hashkey1"=>"hashkey2"}] = {"hashval1"=>"hashval2"}
-    store[{"hashkey3"=>"hashkey4"}] = {"hashval3"=>"hashval4"}
+    store[{"hashkey1"=>"hashkey2"}] = Value.new(:objval1)
+    store[{"hashkey3"=>"hashkey4"}] = Value.new(:objval2)
     store.clear.should equal(store)
     store.key?({"hashkey1"=>"hashkey2"}).should_not ==  true
     store.key?({"hashkey3"=>"hashkey4"}).should_not == true
   end
 
   it "fetches a Hash key with a default value with fetch, if the key is not available" do
-    store.fetch({"hashkey1"=>"hashkey2"}, {"hashval1"=>"hashval2"}).should == {"hashval1"=>"hashval2"}
+    store.fetch({"hashkey1"=>"hashkey2"}, Value.new(:objval1)).should == Value.new(:objval1)
   end
 
   it "fetches a Hash key with a block with fetch, if the key is not available" do
     key = {"hashkey1"=>"hashkey2"}
-    value = {"hashval1"=>"hashval2"}
+    value = Value.new(:objval1)
     store.fetch(key) do |k|
       k.should equal(key)
       value
@@ -1441,90 +2087,92 @@ shared_examples_for 'null_hashkey_hashvalue' do
     store.fetch({"hashkey1"=>"hashkey2"}, :option3 => 3) { 42 }.should == 42
     store.delete({"hashkey1"=>"hashkey2"}, :option4 => 4).should == nil
     store.clear(:option5 => 5).should equal(store)
-    store.store({"hashkey1"=>"hashkey2"}, {"hashval1"=>"hashval2"}, :option6 => 6).should == {"hashval1"=>"hashval2"}
+    store.store({"hashkey1"=>"hashkey2"}, Value.new(:objval1), :option6 => 6).should == Value.new(:objval1)
   end
 end
 
-#################### store_hashkey_hashvalue ####################
+#################### store_hashkey_objectvalue ####################
 
-shared_examples_for 'store_hashkey_hashvalue' do
-  it "writes Hash values to keys that are Hashs like a Hash" do
-    store[{"hashkey1"=>"hashkey2"}] = {"hashval1"=>"hashval2"}
-    store[{"hashkey1"=>"hashkey2"}].should == {"hashval1"=>"hashval2"}
-    store.load({"hashkey1"=>"hashkey2"}).should == {"hashval1"=>"hashval2"}
+shared_examples_for 'store_hashkey_objectvalue' do
+  it "writes Object values to keys that are Hashs like a Hash" do
+    store[{"hashkey1"=>"hashkey2"}] = Value.new(:objval1)
+    store[{"hashkey1"=>"hashkey2"}].should == Value.new(:objval1)
+    store.load({"hashkey1"=>"hashkey2"}).should == Value.new(:objval1)
   end
 
   it "returns true from key? if a Hash key is available" do
-    store[{"hashkey1"=>"hashkey2"}] = {"hashval1"=>"hashval2"}
+    store[{"hashkey1"=>"hashkey2"}] = Value.new(:objval1)
     store.key?({"hashkey1"=>"hashkey2"}).should == true
+    store[{"hashkey3"=>"hashkey4"}] = Value.new(:objval2)
+    store.key?({"hashkey3"=>"hashkey4"}).should == true
   end
 
-  it "stores Hash values with Hash keys with #store" do
-    value = {"hashval1"=>"hashval2"}
+  it "stores Object values with Hash keys with #store" do
+    value = Value.new(:objval1)
     store.store({"hashkey1"=>"hashkey2"}, value).should equal(value)
-    store[{"hashkey1"=>"hashkey2"}].should == {"hashval1"=>"hashval2"}
-    store.load({"hashkey1"=>"hashkey2"}).should == {"hashval1"=>"hashval2"}
+    store[{"hashkey1"=>"hashkey2"}].should == Value.new(:objval1)
+    store.load({"hashkey1"=>"hashkey2"}).should == Value.new(:objval1)
   end
 
-  it "removes and returns a Hash element with a Hash key from the backing store via delete if it exists" do
-    store[{"hashkey1"=>"hashkey2"}] = {"hashval1"=>"hashval2"}
-    store.delete({"hashkey1"=>"hashkey2"}).should == {"hashval1"=>"hashval2"}
+  it "removes and returns a Object element with a Hash key from the backing store via delete if it exists" do
+    store[{"hashkey1"=>"hashkey2"}] = Value.new(:objval1)
+    store.delete({"hashkey1"=>"hashkey2"}).should == Value.new(:objval1)
     store.key?({"hashkey1"=>"hashkey2"}).should == false
   end
 
-  it "overwrites existing Hash values with Hash" do
-    store[{"hashkey1"=>"hashkey2"}] = {"hashval1"=>"hashval2"}
-    store[{"hashkey1"=>"hashkey2"}].should == {"hashval1"=>"hashval2"}
-    store[{"hashkey1"=>"hashkey2"}] = {"hashval3"=>"hashval4"}
-    store[{"hashkey1"=>"hashkey2"}].should == {"hashval3"=>"hashval4"}
+  it "overwrites existing Object values with Hash" do
+    store[{"hashkey1"=>"hashkey2"}] = Value.new(:objval1)
+    store[{"hashkey1"=>"hashkey2"}].should == Value.new(:objval1)
+    store[{"hashkey1"=>"hashkey2"}] = Value.new(:objval2)
+    store[{"hashkey1"=>"hashkey2"}].should == Value.new(:objval2)
   end
 
   it "does not run the block if the Hash key is available" do
-    store[{"hashkey1"=>"hashkey2"}] = {"hashval1"=>"hashval2"}
+    store[{"hashkey1"=>"hashkey2"}] = Value.new(:objval1)
     unaltered = "unaltered"
     store.fetch({"hashkey1"=>"hashkey2"}) { unaltered = "altered" }
     unaltered.should == "unaltered"
   end
 
   it "fetches a Hash key with a default value with fetch, if the key is available" do
-    store[{"hashkey1"=>"hashkey2"}] = {"hashval1"=>"hashval2"}
-    store.fetch({"hashkey1"=>"hashkey2"}, {"hashval3"=>"hashval4"}).should == {"hashval1"=>"hashval2"}
+    store[{"hashkey1"=>"hashkey2"}] = Value.new(:objval1)
+    store.fetch({"hashkey1"=>"hashkey2"}, Value.new(:objval2)).should == Value.new(:objval1)
   end
 end
 
-#################### returndifferent_hashkey_hashvalue ####################
+#################### returndifferent_hashkey_objectvalue ####################
 
-shared_examples_for 'returndifferent_hashkey_hashvalue' do
-  it "guarantees that a different Hash value is retrieved from the Hash key" do
-    value = {"hashval1"=>"hashval2"}
-    store[{"hashkey1"=>"hashkey2"}] = {"hashval1"=>"hashval2"}
-    store[{"hashkey1"=>"hashkey2"}].should_not be_equal({"hashval1"=>"hashval2"})
+shared_examples_for 'returndifferent_hashkey_objectvalue' do
+  it "guarantees that a different Object value is retrieved from the Hash key" do
+    value = Value.new(:objval1)
+    store[{"hashkey1"=>"hashkey2"}] = Value.new(:objval1)
+    store[{"hashkey1"=>"hashkey2"}].should_not be_equal(Value.new(:objval1))
   end
 end
 
-#################### expires_hashkey_hashvalue ####################
+#################### expires_hashkey_objectvalue ####################
 
-shared_examples_for 'expires_hashkey_hashvalue' do
+shared_examples_for 'expires_hashkey_objectvalue' do
   it 'should support expires on store and #[]' do
-    store.store({"hashkey1"=>"hashkey2"}, {"hashval1"=>"hashval2"}, :expires => 2)
-    store[{"hashkey1"=>"hashkey2"}].should == {"hashval1"=>"hashval2"}
+    store.store({"hashkey1"=>"hashkey2"}, Value.new(:objval1), :expires => 2)
+    store[{"hashkey1"=>"hashkey2"}].should == Value.new(:objval1)
     sleep 1
-    store[{"hashkey1"=>"hashkey2"}].should == {"hashval1"=>"hashval2"}
+    store[{"hashkey1"=>"hashkey2"}].should == Value.new(:objval1)
     sleep 2
     store[{"hashkey1"=>"hashkey2"}].should == nil
   end
 
   it 'should support expires on store and load' do
-    store.store({"hashkey1"=>"hashkey2"}, {"hashval1"=>"hashval2"}, :expires => 2)
-    store.load({"hashkey1"=>"hashkey2"}).should == {"hashval1"=>"hashval2"}
+    store.store({"hashkey1"=>"hashkey2"}, Value.new(:objval1), :expires => 2)
+    store.load({"hashkey1"=>"hashkey2"}).should == Value.new(:objval1)
     sleep 1
-    store.load({"hashkey1"=>"hashkey2"}).should == {"hashval1"=>"hashval2"}
+    store.load({"hashkey1"=>"hashkey2"}).should == Value.new(:objval1)
     sleep 2
     store.load({"hashkey1"=>"hashkey2"}).should == nil
   end
 
   it 'should support expires on store and key?' do
-    store.store({"hashkey1"=>"hashkey2"}, {"hashval1"=>"hashval2"}, :expires => 2)
+    store.store({"hashkey1"=>"hashkey2"}, Value.new(:objval1), :expires => 2)
     store.key?({"hashkey1"=>"hashkey2"}).should == true
     sleep 1
     store.key?({"hashkey1"=>"hashkey2"}).should == true
@@ -1533,34 +2181,46 @@ shared_examples_for 'expires_hashkey_hashvalue' do
   end
 
   it 'should support updating the expiration time in load' do
-    store.store({"hashkey3"=>"hashkey4"}, {"hashval3"=>"hashval4"}, :expires => 2)
-    store[{"hashkey3"=>"hashkey4"}].should == {"hashval3"=>"hashval4"}
+    store.store({"hashkey3"=>"hashkey4"}, Value.new(:objval2), :expires => 2)
+    store[{"hashkey3"=>"hashkey4"}].should == Value.new(:objval2)
+    sleep 1
+    store.load({"hashkey3"=>"hashkey4"}, :expires => 3).should == Value.new(:objval2)
+    store[{"hashkey3"=>"hashkey4"}].should == Value.new(:objval2)
+    sleep 1
+    store[{"hashkey3"=>"hashkey4"}].should == Value.new(:objval2)
+    sleep 3
+    store[{"hashkey3"=>"hashkey4"}].should == nil
+  end
+
+  it 'should support updating the expiration time in key?' do
+    store.store({"hashkey3"=>"hashkey4"}, Value.new(:objval2), :expires => 2)
+    store[{"hashkey3"=>"hashkey4"}].should == Value.new(:objval2)
     sleep 1
-    store.load({"hashkey3"=>"hashkey4"}, :expires => 3).should == {"hashval3"=>"hashval4"}
-    store[{"hashkey3"=>"hashkey4"}].should == {"hashval3"=>"hashval4"}
+    store.key?({"hashkey3"=>"hashkey4"}, :expires => 3).should be_true
+    store[{"hashkey3"=>"hashkey4"}].should == Value.new(:objval2)
     sleep 1
-    store[{"hashkey3"=>"hashkey4"}].should == {"hashval3"=>"hashval4"}
+    store[{"hashkey3"=>"hashkey4"}].should == Value.new(:objval2)
     sleep 3
     store[{"hashkey3"=>"hashkey4"}].should == nil
   end
 
   it 'should support updating the expiration time in fetch' do
-    store.store({"hashkey1"=>"hashkey2"}, {"hashval1"=>"hashval2"}, :expires => 2)
-    store[{"hashkey1"=>"hashkey2"}].should == {"hashval1"=>"hashval2"}
+    store.store({"hashkey1"=>"hashkey2"}, Value.new(:objval1), :expires => 2)
+    store[{"hashkey1"=>"hashkey2"}].should == Value.new(:objval1)
     sleep 1
-    store.fetch({"hashkey1"=>"hashkey2"}, nil, :expires => 3).should == {"hashval1"=>"hashval2"}
-    store[{"hashkey1"=>"hashkey2"}].should == {"hashval1"=>"hashval2"}
+    store.fetch({"hashkey1"=>"hashkey2"}, nil, :expires => 3).should == Value.new(:objval1)
+    store[{"hashkey1"=>"hashkey2"}].should == Value.new(:objval1)
     sleep 1
-    store[{"hashkey1"=>"hashkey2"}].should == {"hashval1"=>"hashval2"}
+    store[{"hashkey1"=>"hashkey2"}].should == Value.new(:objval1)
     sleep 3
     store[{"hashkey1"=>"hashkey2"}].should == nil
   end
 
   it 'should respect expires in delete' do
-    store.store({"hashkey3"=>"hashkey4"}, {"hashval3"=>"hashval4"}, :expires => 2)
-    store[{"hashkey3"=>"hashkey4"}].should == {"hashval3"=>"hashval4"}
+    store.store({"hashkey3"=>"hashkey4"}, Value.new(:objval2), :expires => 2)
+    store[{"hashkey3"=>"hashkey4"}].should == Value.new(:objval2)
     sleep 1
-    store[{"hashkey3"=>"hashkey4"}].should == {"hashval3"=>"hashval4"}
+    store[{"hashkey3"=>"hashkey4"}].should == Value.new(:objval2)
     sleep 2
     store.delete({"hashkey3"=>"hashkey4"}).should == nil
   end
@@ -1569,46 +2229,56 @@ end
 #################### marshallable_key ####################
 
 shared_examples_for 'marshallable_key' do
-  it "refuses to #[] from keys that cannot be marshalled" do
+  it 'refuses to #[] from keys that cannot be marshalled' do
     expect do
       store[Struct.new(:foo).new(:bar)]
     end.to raise_error(marshal_error)
   end
 
-  it "refuses to load from keys that cannot be marshalled" do
+  it 'refuses to load from keys that cannot be marshalled' do
     expect do
       store.load(Struct.new(:foo).new(:bar))
     end.to raise_error(marshal_error)
   end
 
-  it "refuses to fetch from keys that cannot be marshalled" do
+  it 'refuses to fetch from keys that cannot be marshalled' do
     expect do
       store.fetch(Struct.new(:foo).new(:bar), true)
     end.to raise_error(marshal_error)
   end
 
-  it "refuses to #[]= to keys that cannot be marshalled" do
+  it 'refuses to #[]= to keys that cannot be marshalled' do
     expect do
       store[Struct.new(:foo).new(:bar)] = 'value'
     end.to raise_error(marshal_error)
   end
 
-  it "refuses to store to keys that cannot be marshalled" do
+  it 'refuses to store to keys that cannot be marshalled' do
     expect do
       store.store Struct.new(:foo).new(:bar), 'value'
     end.to raise_error(marshal_error)
   end
 
-  it "refuses to check for key? if the key cannot be marshalled" do
+  it 'refuses to check for key? if the key cannot be marshalled' do
     expect do
       store.key? Struct.new(:foo).new(:bar)
     end.to raise_error(marshal_error)
   end
 
-  it "refuses to delete a key if the key cannot be marshalled" do
+  it 'refuses to delete a key if the key cannot be marshalled' do
     expect do
       store.delete Struct.new(:foo).new(:bar)
     end.to raise_error(marshal_error)
   end
 end
 
+#################### marshallable_value ####################
+
+shared_examples_for 'marshallable_value' do
+  it 'refuses to store values that cannot be marshalled' do
+    expect do
+      store.store 'key', Struct.new(:foo).new(:bar)
+    end.to raise_error(marshal_error)
+  end
+end
+