juno 0.3.0 → 0.3.1

data/spec/generate.rb

@@ -1,5 +1,5 @@
 ADAPTER_SPECS = [:null_stringkey_stringvalue, :store_stringkey_stringvalue, :returndifferent_stringkey_stringvalue]
-SIMPLE_SPECS = [:null, :store, :returndifferent, :marshallable_key]
+SIMPLE_SPECS = [:null, :store, :returndifferent, :marshallable_key, :marshallable_value]
 EXPIRES_SPECS = SIMPLE_SPECS + [:expires_stringkey_stringvalue]
 header = "# Generated by #{__FILE__}\n"
 
@@ -43,6 +43,7 @@ TESTS = {
     :store => :Memory,
     :options => ':value_serializer => :json',
     :value => %w(Hash String),
+    :specs => [:null, :store, :returndifferent, :marshallable_key],
   },
   'simple_memory_with_quicklz_compress' => {
     :store => :Memory,
@@ -79,6 +80,15 @@ TESTS = {
     :options => ':keyspace => "simple_cassandra"',
     :specs => EXPIRES_SPECS,
   },
+  'simple_hbase' => {
+    :store => :HBase,
+    :options => ':table => "simple_hbase"',
+  },
+  'simple_hbase_with_expires' => {
+    :store => :HBase,
+    :options => ':table => "simple_hbase", :expires => true',
+    :specs => EXPIRES_SPECS,
+  },
   'simple_dbm' => {
     :store => :DBM,
     :options => ':file => File.join(make_tempdir, "simple_dbm")'
@@ -126,12 +136,13 @@ TESTS = {
   },
   'simple_yaml' => {
     :store => :YAML,
-    :options => ':file => File.join(make_tempdir, "simple_yaml")'
+    :options => ':file => File.join(make_tempdir, "simple_yaml")',
+    :specs => [:null, :store, :returndifferent, :marshallable_key],
   },
   'simple_yaml_with_expires' => {
     :store => :YAML,
     :options => ':file => File.join(make_tempdir, "simple_yaml_with_expires"), :expires => true',
-    :specs => EXPIRES_SPECS
+    :specs => [:null, :store, :returndifferent, :marshallable_key, :expires_stringkey_stringvalue],
   },
   'simple_localmemcache' => {
     :store => :LocalMemCache,
@@ -382,6 +393,14 @@ end},
     :build => %{Juno.build do
   use :Transformer, :value => :zlib
   adapter :Memory
+end},
+    :value => %w(String),
+    :specs => [:null, :store, :returndifferent]
+  },
+  'transformer_bzip2' => {
+    :build => %{Juno.build do
+  use :Transformer, :value => :bzip2
+  adapter :Memory
 end},
     :value => %w(String),
     :specs => [:null, :store, :returndifferent]
@@ -593,6 +612,10 @@ end
     :build => "Juno::Adapters::Cassandra.new(:keyspace => 'adapter_cassandra')",
     :specs => ADAPTER_SPECS
   },
+  'adapter_hbase' => {
+    :build => "Juno::Adapters::HBase.new(:table => 'adapter_hbase')",
+    :specs => ADAPTER_SPECS
+  },
   'adapter_cookie' => {
     :build => 'Juno::Adapters::Cookie.new',
     :specs => ADAPTER_SPECS
@@ -605,9 +628,7 @@ end
     :build => 'Juno::Adapters::DataMapper.new(:setup => "sqlite3://#{make_tempdir}/adapter_datamapper")',
     # DataMapper needs default repository to be setup
     :preamble => "require 'dm-core'\nDataMapper.setup(:default, :adapter => :in_memory)\n",
-    :specs => ADAPTER_SPECS + [:returndifferent_stringkey_objectvalue,
-                               :null_stringkey_objectvalue,
-                               :store_stringkey_objectvalue],
+    :specs => ADAPTER_SPECS,
     :tests => %q{
 it 'does not cross contaminate when storing' do
   first = Juno::Adapters::DataMapper.new(:setup => "sqlite3://#{make_tempdir}/datamapper-first")
@@ -682,7 +703,21 @@ end
   },
   'adapter_lruhash' => {
     :build => 'Juno::Adapters::LRUHash.new',
-    :specs => [:null, :store]
+    :specs => ADAPTER_SPECS,
+    :tests => %{
+it 'should delete oldest' do
+  store = Juno::Adapters::LRUHash.new(:max_size => 10)
+  store[0]  = 'y'
+  (1..1000).each do |i|
+    store[i] = 'x'
+    store[0].should == 'y'
+    store.instance_variable_get(:@entry).size.should == [10, i+1].min
+    (0...[9, i-1].min).each do |j|
+      store.instance_variable_get(:@entry)[i-j].should_not be_nil
+    end
+    store.key?(i-9).should be_false if i > 9
+  end
+end}
   },
   'adapter_mongo' => {
     :build => 'Juno::Adapters::Mongo.new(:db => "adapter_mongo")',
@@ -746,9 +781,10 @@ KEYS = {
 }
 
 VALUES = {
+  'Boolean' => [true, false],
   'String' => ['strval1', 'strval2'].map(&:inspect),
+  'Hash' => [{'hashval1' => ['array1', 1]}, {'hashval3' => ['array2', {'hashval4' => 42}]}].map(&:inspect),
   'Object' => ['Value.new(:objval1)', 'Value.new(:objval2)'],
-  'Hash' => [{'hashval1' => 'hashval2'}, {'hashval3' => 'hashval4'}].map(&:inspect)
 }
 
 KEYS.each do |key_type, (key1,key2)|
@@ -813,6 +849,8 @@ end
 it "returns true from key? if a #{key_type} key is available" do
   store[#{key1}] = #{val1}
   store.key?(#{key1}).should == true
+  store[#{key2}] = #{val2}
+  store.key?(#{key2}).should == true
 end
 
 it "stores #{val_type} values with #{key_type} keys with #store" do
@@ -853,7 +891,9 @@ end}
   store[#{key1}] = #{val1}
   store[#{key1}].should_not be_equal(#{val1})
 end}
-    SPECS["returndifferent_#{key_type.downcase}key_#{val_type.downcase}value"] = code
+    if val_type != 'Boolean'
+      SPECS["returndifferent_#{key_type.downcase}key_#{val_type.downcase}value"] = code
+    end
 
     code = %{it 'should support expires on store and #[]' do
   store.store(#{key1}, #{val1}, :expires => 2)
@@ -894,6 +934,18 @@ it 'should support updating the expiration time in load' do
   store[#{key2}].should == nil
 end
 
+it 'should support updating the expiration time in key?' do
+  store.store(#{key2}, #{val2}, :expires => 2)
+  store[#{key2}].should == #{val2}
+  sleep 1
+  store.key?(#{key2}, :expires => 3).should be_true
+  store[#{key2}].should == #{val2}
+  sleep 1
+  store[#{key2}].should == #{val2}
+  sleep 3
+  store[#{key2}].should == nil
+end
+
 it 'should support updating the expiration time in fetch' do
   store.store(#{key1}, #{val1}, :expires => 2)
   store[#{key1}].should == #{val1}
@@ -919,48 +971,54 @@ end}
   end
 end
 
-SPECS["marshallable_key"]  = %{it "refuses to #[] from keys that cannot be marshalled" do
+SPECS['marshallable_key']  = %{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}
 
+SPECS['marshallable_value']  = %{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}
+
 specs_code = "#{header}\n"
 SPECS.each do |key, code|
   specs_code << "#################### #{key} ####################\n\n" <<
@@ -973,7 +1031,7 @@ TESTS.each do |name, options|
   build = options.delete(:build)
   store = options.delete(:store)
   key = [options.delete(:key) || %w(Object String Hash)].flatten
-  value = [options.delete(:value) || %w(Object String Hash)].flatten
+  value = [options.delete(:value) || %w(Object String Hash Boolean)].flatten
 
   specs = [options.delete(:specs) || SIMPLE_SPECS].flatten
   specs_code = []

data/spec/juno/adapter_datamapper_spec.rb

@@ -12,9 +12,6 @@ describe_juno "adapter_datamapper" do
   it_should_behave_like 'null_stringkey_stringvalue'
   it_should_behave_like 'store_stringkey_stringvalue'
   it_should_behave_like 'returndifferent_stringkey_stringvalue'
-  it_should_behave_like 'returndifferent_stringkey_objectvalue'
-  it_should_behave_like 'null_stringkey_objectvalue'
-  it_should_behave_like 'store_stringkey_objectvalue'
   it 'does not cross contaminate when storing' do
     first = Juno::Adapters::DataMapper.new(:setup => "sqlite3://#{make_tempdir}/datamapper-first")
     first.clear

data/spec/juno/adapter_hbase_spec.rb

@@ -0,0 +1,13 @@
+# Generated by generate.rb
+require 'helper'
+
+describe_juno "adapter_hbase" do
+  def new_store
+    Juno::Adapters::HBase.new(:table => 'adapter_hbase')
+  end
+
+  include_context 'setup_store'
+  it_should_behave_like 'null_stringkey_stringvalue'
+  it_should_behave_like 'store_stringkey_stringvalue'
+  it_should_behave_like 'returndifferent_stringkey_stringvalue'
+end

data/spec/juno/adapter_lruhash_spec.rb

@@ -7,22 +7,20 @@ describe_juno "adapter_lruhash" do
   end
 
   include_context 'setup_store'
-  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_stringkey_objectvalue'
   it_should_behave_like 'null_stringkey_stringvalue'
-  it_should_behave_like 'null_stringkey_hashvalue'
-  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 'store_objectkey_objectvalue'
-  it_should_behave_like 'store_objectkey_stringvalue'
-  it_should_behave_like 'store_objectkey_hashvalue'
-  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_hashkey_objectvalue'
-  it_should_behave_like 'store_hashkey_stringvalue'
-  it_should_behave_like 'store_hashkey_hashvalue'
+  it_should_behave_like 'returndifferent_stringkey_stringvalue'
+  it 'should delete oldest' do
+    store = Juno::Adapters::LRUHash.new(:max_size => 10)
+    store[0]  = 'y'
+    (1..1000).each do |i|
+      store[i] = 'x'
+      store[0].should == 'y'
+      store.instance_variable_get(:@entry).size.should == [10, i+1].min
+      (0...[9, i-1].min).each do |j|
+        store.instance_variable_get(:@entry)[i-j].should_not be_nil
+      end
+      store.key?(i-9).should be_false if i > 9
+    end
+  end
 end

data/spec/juno/adapter_memory_spec.rb

@@ -10,19 +10,25 @@ describe_juno "adapter_memory" do
   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_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_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 '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_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_hashkey_objectvalue'
   it_should_behave_like 'store_hashkey_stringvalue'
   it_should_behave_like 'store_hashkey_hashvalue'
+  it_should_behave_like 'store_hashkey_booleanvalue'
 end

data/spec/juno/expires_file_spec.rb

@@ -14,30 +14,39 @@ describe_juno "expires_file" do
   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_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_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 '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_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_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 'expires_objectkey_objectvalue'
   it_should_behave_like 'expires_objectkey_stringvalue'
   it_should_behave_like 'expires_objectkey_hashvalue'
+  it_should_behave_like 'expires_objectkey_booleanvalue'
   it_should_behave_like 'expires_stringkey_objectvalue'
   it_should_behave_like 'expires_stringkey_stringvalue'
   it_should_behave_like 'expires_stringkey_hashvalue'
+  it_should_behave_like 'expires_stringkey_booleanvalue'
   it_should_behave_like 'expires_hashkey_objectvalue'
   it_should_behave_like 'expires_hashkey_stringvalue'
   it_should_behave_like 'expires_hashkey_hashvalue'
+  it_should_behave_like 'expires_hashkey_booleanvalue'
   it_should_behave_like 'returndifferent_objectkey_objectvalue'
   it_should_behave_like 'returndifferent_objectkey_stringvalue'
   it_should_behave_like 'returndifferent_objectkey_hashvalue'

data/spec/juno/expires_memory_spec.rb

@@ -13,28 +13,37 @@ describe_juno "expires_memory" do
   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_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_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 '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_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_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 'expires_objectkey_objectvalue'
   it_should_behave_like 'expires_objectkey_stringvalue'
   it_should_behave_like 'expires_objectkey_hashvalue'
+  it_should_behave_like 'expires_objectkey_booleanvalue'
   it_should_behave_like 'expires_stringkey_objectvalue'
   it_should_behave_like 'expires_stringkey_stringvalue'
   it_should_behave_like 'expires_stringkey_hashvalue'
+  it_should_behave_like 'expires_stringkey_booleanvalue'
   it_should_behave_like 'expires_hashkey_objectvalue'
   it_should_behave_like 'expires_hashkey_stringvalue'
   it_should_behave_like 'expires_hashkey_hashvalue'
+  it_should_behave_like 'expires_hashkey_booleanvalue'
 end

data/spec/juno/lock_spec.rb

@@ -13,19 +13,25 @@ describe_juno "lock" do
   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_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_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 '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_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_hashkey_objectvalue'
   it_should_behave_like 'store_hashkey_stringvalue'
   it_should_behave_like 'store_hashkey_hashvalue'
+  it_should_behave_like 'store_hashkey_booleanvalue'
 end

data/spec/juno/null_adapter_spec.rb

@@ -10,10 +10,13 @@ describe_juno "null_adapter" do
   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_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_hashkey_objectvalue'
   it_should_behave_like 'null_hashkey_stringvalue'
   it_should_behave_like 'null_hashkey_hashvalue'
+  it_should_behave_like 'null_hashkey_booleanvalue'
 end

data/spec/juno/proxy_expires_memory_spec.rb

@@ -15,28 +15,37 @@ describe_juno "proxy_expires_memory" do
   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_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_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 '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_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_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 'expires_objectkey_objectvalue'
   it_should_behave_like 'expires_objectkey_stringvalue'
   it_should_behave_like 'expires_objectkey_hashvalue'
+  it_should_behave_like 'expires_objectkey_booleanvalue'
   it_should_behave_like 'expires_stringkey_objectvalue'
   it_should_behave_like 'expires_stringkey_stringvalue'
   it_should_behave_like 'expires_stringkey_hashvalue'
+  it_should_behave_like 'expires_stringkey_booleanvalue'
   it_should_behave_like 'expires_hashkey_objectvalue'
   it_should_behave_like 'expires_hashkey_stringvalue'
   it_should_behave_like 'expires_hashkey_hashvalue'
+  it_should_behave_like 'expires_hashkey_booleanvalue'
 end